2D and 2C won't make a difference. 2D with NiMHs might be a better candidate for a "safer" light though (2C uses unprotected Li-Ions). If you want longer runtime, you'll have to goto 4D, or 6D.
Or if you have the equipment, you can bore out (cut grooves into the body of the light on the inside) the Maglite for different power packs like 3D quad bored with 12AAs setup as 6S2P (Fivemega i believe are selling some lights in this config). Or 2 1/2D dual bored for 4 LI-ions 18650 in 2S2P.
I have a standard recipe 2D ROP and a 3D ROP using 4 of those 18650 Li-ions. The 3D is actually a fair bit lighter than the 2D and ALOT brighter. However, it wasn't cheap to build and you need to solve the batterypack problem too (no one on CPF is selling a holder for 4x18650 in 2s2p).
A resistance reduced 2D will run for about 16 minutes with CBP1650s. The 2C for about 22 minutes. 4D for about an hour, 6D will give about 3 hours. All of those times are with the high bulb.