I ordered the correct ones for my 22 from
www.bike-parts-husqvarna.com
It was a little pricey, but it also arrived in a few days from Europe to Canada with fedex, I was surprised by that.
I originally ordered the set from the beginning of this thread but they were a different connection. I ended up getting part numbers;
28114025000
28114026000 left and right lights
90511030000 led relay
Good news is these part numbers are for the newer models, not sure when exactly they changed. All plug and play, everything works perfect, except if you're adding more.
I added motogadget mblaze disc bar end lights and the oem led relay had them all dim and barley blinking, but worked fine with just the oem led lights.
Solution was cheap led relay off Amazon, surprisingly.
Really happy with the results, still 4 feet of snow in the yard but spring is coming!