HONDAMAN's RELAY kit (if you can't wire up your own)...
PLUS
the HELLA Lens housing (designed for jeeps mostly, but works perfectly on our bikes). Excellent focusing of the lens and housing - far far far better the oem or cheap autoparts aftermarket.