Convoy S2+, shorty tube, replace reflector with a 20mm TIR lens, squeeze an 18500 in there. Worst case, cut down a spring for a little more room inside. Or replace the driver-side spring with one of those brass nipples instead.

“18350” light that fits an 18500. Magic…