Wouldn’t 16650 work for you?
If yes, Intl-Outdoor has decent Sanyo UR16650ZT based batteries that are 2100mAh if you charge them to 4.3V, and somewhere around 1800mAh if charged to 4.2V. They’re available in both protected and unprotected versions.
As for charger… ML-102 if you need 1-bay, Xtar WP2 II if you need 2-bay.
I have had 4 off these chargers. They dont charge at a fast rate but do the job. All four have terminated at 4.18 to 4.2 volts. I highly recommend this charger.
Go with the 16650 Sanyos. I have some lights that are supposed to take 17670, but the AW 17670 I have are too fat, or so snug I worry about expansion. The Sanyos fit in anything and have a larger capacity.
As far as I know and based on 4sevens correspondence, 18650 cells DO NOT fit in this flashlight. Would this mean 16650 does not fit also?
EDIT:
Here is 4sevens response…They talk about WIDER….Guess it will fit??
_*Thank you for your interest. The 18650 cell is much to wide for the
body of this light. That said, two RCR123A will work great. Please let
me know if I may be of any further assistance.
I really can’t comment on the charger. It’s a crap shoot when purchasing cheap chargers. I personally believe in buying good chargers with a proven track record. If a charger doesn’t cut off early enough, and overcharges your cell past 4.2v, that’s bad. Bad for the battery, and could lead to worse catastrophic events.
But if you insist, the Sanyo 16650 is one of the few cells that is rated for 4.3v., so you have some leeway.