Hot Rodding Maglite 2 & 3 cells

As far as DIY options go there are plenty of triple/quad optics and reflectors available and the shorter depth allows for plenty of additional heat sinking. You might try skimming OL’s BLF modding links thread for ideas.