I'm nuts but....I'm thinking of cutting down my D and 3w...

Would I be better off trying to find a little heavier shaft that's already shorter, that will give me the Swing weight I'm looking for?

If you hit it well choking down , keep doing it. Why do you mess around with static weight and balance. I know several guys that had experimented cutting down their shaft then after a short period bought a new shaft (if not a complete driver). Doing so you risk to have an unsellable piece and maybe still not happy with your swing.

Try first to understand the best static weight/swing weight/length  for you, than buy a new one to specs. The research and testing can be done with no money using friends drivers and going around driving ranges.

Do not test indoor, fake numbers. Trust your eyes always

I think you need to install the  weight of the shaft that fits you, and find a professional club maker that will hot melt the head --  the club maker also has to tip the shaft to fit the extra weight in the head -- in that way you have a balanced club that fits.

For example, the Callaway XR head gets grief because it is 46 inches with a very light head. He hot melted the head to get the setup to work at Stiff Flex at 45 inches and D2.

I'd recommend that route.

If you want to regain the swingweight, you could try to put some tungsten weight squares on  the clubhead. But, the ridges and rails on the XRail sole might make it difficult for the weight squares to stay attached. (I considered this with my XRail 4W and 7W).

Or, you could have a clubsmith pull the shaft and put a tip weight in the shaft. Or, some clubsmiths will pull the shaft and squirt filler glue - AKA hot glue or rat glue - into the clubhead to increase the weight. Some people don't like filler because of fears it will partially melt and shift inside the clubhead during hot weather.

For your comment, to put some weight back at the butt, this will not increase swingweight. Putting the weight into the butt end of the club is called backweighting, or counterbalancing. This will lessen your swingweight, but increase overall club weight.

If you go to a lighter grip than the original, this can help you recapture swingweight. A good clubfitter can explain the calculations on this.

That's probably what I'm going to do... Just choke down an inch or two and leave the Driver as is... Could just take the r510 back out for a spin too...

If you are going to grip down, you could replace your grip and put an extra wrap or two for the lower hand since grips typically taper.

I was thinking of cutting my driver down but this sounds like good advice for me. I do hit it better choked up but can hook it too easily at times. I might put a midsize on instead of the wraps. Thanks.

When learning to hit driver, I used to buy cheap used clubs, experiment and cut the shafts down a lot - really helped me in my formative years.   Same with a 3 wood.    Now, I'm ok with full length, but it took a while to get comfortable with the longer clubs.  I definitely recommend shortening shafts as it makes things a whole lot easier & seeing if it works for you (I always hated choking up, so I preferred shortening shaft lengths - its easy) ...