Form factor of S2, but has better throw… BLF A6. All other suggestions have been different form factor and are rebutted by OP with “S2”, so here we go…

A6 w/ XPL (can be de-domed with novice skills to make it XPL-HI). Add a Carclo 10507 or 10511 TIR optic to aid beam with novice skills while the bezel is off to de-dome. 30min of effort if you stop mid-way to go have a beer.

I’m a BLF newbie, too, but already infected with modumust syndrome.