So the headlamp on the Raid seems quite rare. I've had melting wires issues with the aftermarket one on mine so looked for a new one. Having taken it off I reconised the plug as the same on my 350LC. Maybe a lot of yams have this plug?
So I bought a copy 350lc headlight from Busters for £30. After a bit of demelling at the back here we have the headlight ....
Looks better than the one I had. Cheaper than a Yam one and with the correct bulb size and fitting. Bingo.