Get the fake magicshine as a backup! That's what I did... They're slightly different. I put them side by side on the bars (one on either side of the stem) and put one battery pack in front and one behind the head tube. There's enough light to go bombing down Harbor Blvd at 35 mph too.

The problem with the flashlight route is that you need to invest in infrastructure (batteries, chargers) and that makes an inexpensive flash light not very inexpensive. I have two of the 26650 lights, and they're stupid bright but they're a little bulky to be considering mounting on my helmet. They're awesome for camping, walking the dog or any other activity that requires a flashlight though. So there's that.

I do recommend having a backup light for exactly the reasons you just experienced.