You can always skip the rear o-rings altogether and just JB weld (or better yet Alumaloy braze) it solid. Less o-rings = less failure points.
I'd also suggest potting compound for the switch area once you test it and everything is working fine in the hand unit... that stuff will help support the case by filling in air pockets, and completely waterproof any PCB or solder points in the unlikely event of a water seal breach.
Just mix it up like epoxy and pour it on... it'll settle into anything and set up in 24 hours. I bought a small supply of the stuff years ago and love it for weatherproofing any electronics that'll see vibrations, pressure, oil, coolant, or water. Back-filling cable glands with the stuff is a perfect application BTW.
It really is strange to me to see all these underwater lights and gear made by divers without mention of potting compound and brazing compounds. Cheap and massively effective to make your stuff bomb proof. I'd wager it possible to ziplock a battery pack and harness/cable, fill it with potting compound, and have a custom-canister that'll run to 500+ feet (the head is obviously another matter, but you get the idea).
Just something to think about.
Alumaloy home
Clear Encapsulating and Potting Epoxy Compound > RoHS Compliant (I use black, but you may prefer clear... imbed a few LEDs and make it a glow stick
).