Thanks everyone for the comments/suggestions.
Ended up getting a 2 pack of SilverStar lights. Believe it or not, I put a SilverStar in the Std back in 2005. And it is still working. The original owner had one of those prism bulbs that made the light look multi colored, so of course it had to go.
My wife rides the Std and during the daytime running the high beam, with her behind me, looking in my mirror is like looking into the sun.
I'm sure this will be a huge improvement over the originals.
I will remove the fairing to make the change out easier. While I am in there, I have a hard wire kit for my XM that I will tap into a switched source. Probably the same location where I hooked up the Zumo.
And yes, I have read over the years where a tab or two needs to be removed for the bulbs to fit.