I'd fitted a 35W Hid (H7 short bulb) to my old tenere and it gave a fairly impressive beam without too much over spill (HIDs can be quite poor in reflector lamps if not aimed well)
Note I used a short bulb with a metal base (obtained separately to the HID kit) as longer bulbs with plastic bases were giving a lot of scatter to the beam.
Easy to do and undo.
This may be slightly illegal and could fail an mot but as said easy to undo too so a quick swap back to a stock h7 bulb is possible and easy to do at the roadside on a 660z

__________________
ex XT660X Tenere, now XT1200Z Super Tenere