An S2+ with a shorty tube can be nice. Uses an 18350 instead of a 16340, but for the miniscule increase in size you get way more oomf (capacity and current).