Found these on Amazon (https://smile.amazon.com/gp/product/B08147VTT1/ref=ppx_od_dt_b_asin_title_s00?ie=UTF8&th=1) after the last set faded horribly and failed to stand up to the road grit that attacks them at all times. These are very solid construction, and come with all the necessary wiring, relay, etc. I completely removed the previous setup, and used the enclosed wiring, even though the old one's wiring could have been used.
(https://i.imgur.com/hIatiAa.jpg)
I mounted the switch just above the high beam switch, actually just used the upper hex bolt of the clutch mount. Perfect location.
(https://i.imgur.com/i3vJTuE.jpg)
(https://images-na.ssl-images-amazon.com/images/I/61wMNNdrDBL._AC_SL1000_.jpg)
They are a little larger than the previous set, and sit a little proud of the engine bars, which means they will likely be damaged in a drop, but I like the price, and the light output is probably illegal. Perfect for those dark backroad commutes. Also, the ability to change to a flashing mode is nice.