I tried one of the Smudge (www.mtbbatteries.co.uk) XML T6 lights for the first time tonight.
Perfect helmet light. I had it paired with a 3 x xpg light – LightandGo Fireball (pretty much the same as the Magicshine mj-870. The XML is very impressive – way more throw than the Fireball and loads of useful spill of light nearer to as well.
Considerably brighter than my Magicshine MJ836 I had before. Also seems to be much easier on the battery – more than 50% left after a 2.5 hour ride, the P7 based light would have used a lot more.