Nice one. Enjoy the new ride.
The problem with the Tenere's headlight is the basic reflector design - it's crap! You'll help a bit with better bulbs, but they won't fix the cause. You can wire the dip to stay on with main, but that only helps with main beam for a large increase on the charging load. HIDs just spray light out in all directions and annoy other road users. Spot lights are a bit hit and miss; a pair of 55W halogens leave marginal spare capacity in an already challenged charging system, and the LED offerings are variable to say the least, some good, some rubbish, some cheap, some bloody expensive!
You could just eat a shed load of carrots!