The control assembly had also gotten progressively worse to the point the horn button didn't work anymore and it was hard to turn off the turn signals.
So I ordered a generic one from Amazon, manufactured by Kawell and less than $9! It's about $90+ for one from Yamaha.
Image source: Amazon
Link to switch -Amazon Affiliate Link
I've been home since Friday, had time today to retrieve Yagi from the RV Storage Yard and work on her switch control swap.
Pretty straightforward, you have to determine which color wires do what on each switch assembly, the old one and the new one. Then match up the wires correspondingly, test, and when everything works as it should, make hopefully permanent connections and tidy things up. No, color schemes don't match up, at all.
Made a couple of mistakes, one cost me a blown fuse as I apparently hooked up wrong wires the first time; and the other was I wired the high beam switch setting to the low beam wire and vice versa. Not difficult to correct as you might imagine.
For my reference, here's the wire combinations:
First, the headlight beam modes. Sorry for the blurry picture, but not going to unwrap everything to retake the picture.
Basically: Top is Yamaha (Y) wiring, bottom is Kawell (K) wiring.
(Y)Green to (K)White
(Y)Yellow to (K)solid blue
(Y)Blue with black stripe to (k)Blue with white stripe.
Note, these three wires on the Kawell side were "loose" and not used in the connector it came with, the connector isn't usable with the stock Yamaha connector.
Next come the turn signal and horn wires. Again, Yamaha wires on the top and Kawell wires on the bottom.
(Y)Black to (K)Aqua (horn)
(Y)Pink to (K)Green (horn)
(Y)Dark Green to (K)Light Blue (Left Turn)
(Y)Brown with White stripe to (K)Gray (Turn signal off)
(Y)Brown to (K)Orange (Right Turn)
Here's what the switch control looks like, mounted on Yagi's handlebar. Yeah, it's not push to cancel on the turn signal but then again, that didn't last long on the stock version of the control switch.