@fivemega makes (made?) Surefire-compatible 3P-series bodies and also Malkoff MD1 bodies. There's a couple sales threads of his, not sure what is still up for sale. Also keep an eye out for them on the secondary market.
Remember Malkoff M31 series will be damaged by a Li-ion, so only CR123 at...