Does that model have the retaining ring on the switch that you need to tighten using the 2 indentations.
Check the contact points near the head, and make sure you clean off excess grease. Mine flickers if the grease flows into the contact path. Of course mine is the older XM-L, so YMMV.
how do i tighten exaclly