Jack, these days on my Tenere I run 4 x 4 inch 35W LEDs with a 'spot' pattern and I'm happy with those.
Initially I ran 2 in 'spot' and two in 'wide', but I realised that there was enough spill from the spots to cover the sides of the road adequately, so opted for more down the road punch.
I like the LED set-ups as they are instantly on, as opposed to HID with that slight delay, and it is easier to create an even 3D field of light. HIDs don't like being cycled on and off too much either of course. However, for straight down the road performance this HID set-up I had previously was superior:
On the Nullarbor Plain I was flashed by an oncoming truck and travelled 16km (10miles) before I reached him. Even if he only travelled 14km over the same period I estimate that I was at least 30km away from him when he flashed me. Thats enough down the line punch I reckon.
Unfortunately those el cheapo 35W HIDs are hard to come by these days.
Its a dodgy-looking set-up, but a combination of HID 'spot' and LEDs in a wider pattern both on the same switch can be nice.