I've just fitted Philips Racing Vision GT200 H7s to the dipped and it's definitely a worthwhile improvement to the standard ones (also Philips).
Interesting point about LEDs being ok on main beam - there isn't a H17 equivalent of the Racing Vision - I'm tempted.
(I have a SWB 6.1 Shuttle, other bulb-changers might like to know that I didn't have to remove the air filter or anything, but it is a bit fiddly. I might have needed sectioning under the mental health act if I hadn't found this post about swapping H15s:
T6.1 H7 & H15 Bulb Upgrades)