Well the Olight S1R baton might meet your needs. I don't have it yet - but it will be the next torch (flashlight) I buy. Or possibly the S2R if you need the extra battery life. The magnetic base may be particularly handy in the workshop.
I really like my Mecarmy PT16 & PT18 a lot.
Just seeing that Triple looking back at me makes me smile and the floody beam is really handy for me for sure.
The only downside to me is that the Bezel is too sharp and seems to wear through the pants pocket like crazy.