Same, I have bought several ( do not loan them out & they don’t float )https://www.streamlight.com/products/detail/waypoint-400
Best I've ever had
I've just been using a Ryobi Spotlight since I have the 18v batteries aboard anyway for other tools. It works as well as my old Q-beam.
https://www.homedepot.com/p/RYOBI-ONE-18V-Cordless-LED-Spotlight-Tool-Only-PCL661B/316630705