What about the C8F-21700? Takes a 21700 or 18650 with a sleeve. No built-in charging, but can probably get a cell with onboard charger. Sideclicky sets modes and soft on/off, rear tailclicky is momentary-on and remembers its last mode. Something like 2000lm, can probably sustain 1000lm forever as it’s pretty beefy and sheds heat well.
Blah blah blah. Nice light.