I just bought a Tenergy 8 cell battery and soldered on my own MagicShine connector, cut off of an extension cord bought from DX for $3. I have a lot of run time.
At the time the Tenergy 8 cell packs were on sale for < $30, but I think they're about twice that now.
__________________
Work: the 8 hours that separates bike rides.