Laurie gave me the same advice earlier this year. She said it is usually better to sell before the refinish at a discounted price and let the new owner decide if the additional work is worth the time any money. As always, I followed her advice. Selling the cue with original finish gave me a chance to show off the good care I had taken of it for 20 years.
I guess I would also question adding a second shaft except for your personal use. Most players want two, probably a hold over from the tradition. But IMO, it is better for the new owner decide what taper, ferrule, LD, etc. The new owner probably won't want to send it off right away. But the other way of looking at it is the new owner would be getting a custom SW with a wait of only 20 weeks rather than 11 years.
Glad to see another convert. There has been quite a bit written in AZB about SW and if their reputation is hype. Those of us who owned their cues and played with them for years are not swayed by the lack of understanding in some of those posts. The Franklins have given us great playing, classy looking cues for ~30 years.