I would suggest another option. Get a Magic Shine and wait to see what the independents do with the new Cree XP-G chip, which delivers almost 400 lumens per chip. Several independent fabricators have just received the 7 XP-G round chip and are beginning to work on fabricating their designs--yes, that's 7 XP-G chips on one large die. It will be blindingly bright (almost 3,000 lumens), but multiple-mode drivers will enable you to go to a low setting. You could also look at low-profile multiple XP-E helmet lights available now like Troutie's. Here's a picture of Troutie's Lumen Liberator and a shot showing how it lights up a forest trail at night; yes, that's a lot of light for a small LED, but the Crees are fantastic and affordable.
You might also check out MTBR.com's threads on lights. Candle Power forums is also another good site. Good luck.