I've used flashlights and a couple of magicshines over the years, and have never gotten the advertised run times out of any of my lights. The magicshine came close with the original battery and is easy to charge if the charger and an outlet are nearby, the NiMH flashlight batteries are a little harder to charge and didn't last as long. If I were going to do it all over again, i think I'd go with a the 26650 batteries and a flashlight like you mentioned above. They'd be easier to switch from bike to bike and easier to mount on the helmet too.