OK, I get the CR123 thing, but do not dismiss the AA and AAA size used with the L91/92 sized lithium primary batteries. If your department buys the batteries for you, the EOD, Aviation or Incident Command section will have a order number for these, as they use them for stuff that has to work out of storage. If not, hunting around, the AAA and AA lithium primaries can be had at CR123 prices. The main advantage is the use of other stock batteries, alkaline, which I know you do not like, but hear me out.
The 1.5V AA lithium primary have 3000mah capacity, or the equivalent watts of a 1500mah 3V CR123 (1/2 mah, doubled voltage), so they are effectively the same as a CR123, and single AA lights are thinner than the CR123 (more types too). Double AA will of course have twice the run time of the single lights.
The AAA is only about 1200 mah for the Lithium primary, so the run time suffers until you go to a 2x AAA, then it is almost equal to a CR123, and a lot nicer form factor to carry. A 1x AAA is too easy to carry, so there is that plus, even with the detriment to run time and brightness.
The last thing to consider is the dreaded alkaline compatibility. If you have the store chain “Dollar Tree” in your area, hit it up and buy a four pack of the alkaline Sunbeam batteries (NOT the heavy duty, they are lower capacity by 2/3). AA HERE AAA HERE For $0.25 you have a decent alkaline that you can afford to replace daily if you want. I saw a few comments that these are about 90% as long lived as the “brand” alkaline batteries, but are 75% cheaper. I like a ten percent loss for a 75% savings… A 20 work day month will cost you $5 in AA alkaline this route, no worries about leaking if you change them out daily as an extreme example. Plus if you give away the light to someone that needs it, they can get batteries easily and cheaply, unlike “retail” CR123 prices…
Perhaps this information will help in your search…
Tech bulletin on Lithium Primaries