M*gCharger battery has about 32mm diameter and length of 180mm with 6 Volt and capacity of (2200, 2500, 2600 NiCad) or (3500mAh NiMH)
2x21700 has about 21.5mm diameter and length of 150mm with 7.4 Volt and capacity of 5000mAh
It will be a good idea to switch to 2x21700 if you willing to individually charge them with proper charger.
LEDs can take 1.4 Volt extra but for incands there are many long life 6 volt bulbs (5W, 10W, 20W and 30W) to choose from.