Oooooppps,
Sorry i was wrong about the cells, they are 6 cells in series!!!
However, may be 3x17670 or 4 x 17670 side by side with regulation. There will be left some space for regulation circuit. Charger will become just a host, as a cradle charging connected to some Li-ion pack charger.
Maybe if there was a socket for the high and low bulb we could have use a higher rated bulb lumen in both chambers. Or Led module/tower for the low (some MCE or P7) and a higher rated bulb for the high.
I have the light since 2002 and never had a heavy use of it, as the run time was short with no proper holster (back then).