Maxtoch M24s

LED Flashlights – General Info 18650 Flashlights
16

Here is a good write up on the M12. It would probably fit your need a little better