How about setting the ramping limit on the top end of the D4 to just shy of “Nut Roasting” and see how that works for you?
Also the newer D4V2 has better thermal management than the original as I understand it which could also help avoid another bad experience.
There is also a Magnetic Tail Cap option and interchangeable optics in the new version that seem like they might be for you?

I know that I am in the same boat as you for work pretty often and have been carrying a D4 for a while but I do try to lock it out mechanically every time too and so far I have only tried to burn my junk down once somehow?!

The D4 is just such a terrific light I would not forsake mine for one with a little charging convenience and I carry spare 18650’s so that I do not have to wait either.