The Dinotte. Go directly to Dinotte. You can get the 200 lumen version instead of the 120 that is listed on Nashbar for $40 more or delete the batteries and charger if you already have them and get the more powerful light for $20 more. If you ask them nicely they may even throw in an extra battery holder. If you are going to use it as a helmet light you might want to consider the version that has the mini-tail light.
I have a buddy that purchased the original helmet/bar/taillight combo in Li-ion. They offered an upgrade package to increase his power in both headlights from 120 lumen to 200 lumen and longer lasting batteries. He liked them before and even more now.