Congrats on a great looking car, Brent, and thanks for the feedback on how a purchase from the 'new' VS worked out for you.
I think I would just go ahead and drive it with the shifter you've got for a while to see how it suits you.
After a few years, I put the Vintage Speed shifter in my VS:
The base is a little more 'finished' looking than the stock VW unit and is designed to be installed without a 'boot' over it. I think the ivory one would look good in your car - probably a close match to your steering wheel. Note that the one they sell now has a small collar that you pull up to access the reverse gate. On mine, you pull up on the whole lever.
Also note - the company's name is Vintage Speedster - no 's' on the end and not related to Vintage Speedsters in any way. They're located in Taiwan, but make high quality products and are great to deal with (if a little slow to answer e-mails). They make a number of different versions of this shifter (and will customize to order if you want), so make sure you understand all the options before ordering if you decide to get one.