I was going to suggest one, but hey, just get the shorty tube instead of the whole light.
Mix’n’match colors, even.
Easy to do an emitter-swap, and stick a nice TIR lens for throw or flood or anything in-between. The come-with 4C and a 60° TIR lens is nigh perfect for close-in work.
Also, some Solarforce L-series lights have / come with shorty tubes, as they typically would take a pair of ’123s.
I keep a Jet-II (twisty, nomem, start-on-low) in my bag as an emergency light. Quite nice, but not the modes you want.
A tailclicky 16340 (or even 18350) seems like a pretty tall order. Haven’t seen many at all.