If you’re willing to use a separate charger (not USB or magnetic charger connecting to the light) the Convoy S2+ or BLF A6/Astrolux S1 (same light, just make sure you’re getting the battery tube length you want, there are 18650 and 18350 options) are hard to beat.