Battery Junction sells 18650 battery packs with safety circuitry installed including 7.2 volt 2, 4 and 6 battery packs. The latter should give increased burn time compared to any Magicshine pack. You will have to come up with your own power cord and connectors, possibly from a Magicshine extension cable? Also the big pack will almost certainly not fit in the old cordura carrier.
__________________
Gear Hubs Owned: Rohloff disc brake, SRAM iM9 disc brake, SRAM P5 freewheel, Sachs Torpedo 3 speed freewheel, NuVinci CVT, Shimano Alfine SG S-501, Sturmey Archer S5-2 Alloy. Other: 83 Colnago Super Record, Univega Via De Oro
Visit and join the Yahoo Geared Hub Bikes group for support and links.
http://groups.yahoo.com/group/Geared_hub_bikes/