That looks like a great light, and I would encourage you to not abandon it due to cell type/size. I have been using an Ultrafire (I'm cheap!) XR-E R2WC light that has a similar drive voltage of 3.0-8.4 and had no issues using either primary CR123 (16340) (Surefire branded) or rechargeable RCR123 - the RCR's are grey label "Trustfire" and were used with a charger of no particular brand. Nothing blew up, leaked, or gave me any cause for concern.
The light and batteries were subjected to a number of incidental drops in & out of use, neither with any sign of distress. The RCR's are protected-type, so they shutoff when run too hot or low. Primaries I have run quite hot for extended periods without any issues, both in this light and a smaller keychain light that uses a single 123.
I am awaiting delivery of a new light that uses 18650 cells, and will be getting rechargeables in this format. The switch on my other one failed after 2.5 years, so I hope to find something to replace that switch with in time.
Either way, hope you find something that works well for you.
Chris