I'm in forensics where I go into the field frequently at night looking for things in close and far distances, sometimes very small things. I've been using the Thrunite TN36 (floodlight 4x18650) and the TN40 (searchlight- not removable battery) along with the TN4A (compact floodlight 4xAA). I charge these lights everyday. It's been 3 years and I would like to upgrade these lights. I want lights with roughly the same size but brighter and lasting longer at high brightness (longer drain time?). In terms of the TN4A I would like to upgrade to a slimmer tactical version (button at the end). I've tried the Olight M2R Pro but find the light beam to be too narrow and it gets very hot quickly. Thank you for the advice.