Just order a pair of the Trust fire protected 18650 batteries and charger from DX like you should have. I know-1 to 2 weeks wait. Perhaps you could make a spacer and use one CR123 battery while your waiting for DX.