I just noticed that the Convoys at IS don’t have the strobe you mentioned, don’t know if that’s a deal breaker for you though, fasttech has the 5 mode version.
M1 review
XM-L2 emitter results
I usually estimate a 20% loss through reflector and lens when looking at the emitter results vs flashlight lumens
I think the Panasonic NCR18650B (protected, button top) that RMM has for sale look good, they are on the long side so you might want to see of anyone has fitment issues with long cells in the Convoy lights.
Also, if you want to replace the driver the Qlite is a really good one (also at RMM’s store), no visible PWM flickering or hum, and you can solder the second star for strobe and a beacon (5-mode). I use it in an L2T with a warm XM-L2 and am very happy with it.