How about Mankerlight MC13 II with SBT90.2 ($110 USD) emitter or sft40 ($65)?
http://mankerlight.com/mankerlight-mc13-ii-90-2/
It’s a larger 18350 light that twists open to 18650. The TIR is similar to Thrunite Catapult v1 and possibly Wurkkos ts11.
.
A 21700 tube was also released as part of a bundle or here: https://www.killzoneflashlights.com/products/manker-21700-tube-for-mc13-ii-e14-iv.
I don’t have this light but it seems like OK value for the higher price (for very short bursts of throw, not sustained).