If you want a good small light that can be locked out look at the Ultratac K18 Mini. I had the same issue as you and haven’t looked back since. Double click while it’s off to activate electronic lock out. Then when you want to use it double click again to unlock.