You can find more tight lenses for nichia than for xm-l.
Nichia is smaller die and you can use any xpg/l optic.

If driver not have lock option you can add latching switch or inline waterproof switch like: