I just placed an order with Battery Junction. I ended up getting an Olight M20S-X. It's smaller than the M30 and still puts out a decent amount of light. The removable bezel and the ability to immediately access the strobe with 1 hand were the deciding factors.
For some reason there was also a Nitecore IFE1 in the cart when I checked out.