A Quark mini AA should be right up your street
Got to say the threads are so buttery smooth on my Mini AA that one handed operation is easy
The Streamlight micro stream is AAA , tad bit bigger than the S2 , more throw , only one level of output . Not sure I'd consider it a step up .Chris