I had to look at your post to understand what he meant about the tailcap. Yeah, good idea to swap P3x Tc with Z41 tailcap. I like Z41 a lot better. In fact, I use the twisty option on the TC of Surefire G2x Pro myself, and not the clicky.
From zero to two SF lights in a week. Good job!
Been a while since I accessed the Surefire drawer or posted a photo...
http://i958.photobucket.com/albums/...6-03/8215D2D3-5381-4146-B810-06633EF384AE.jpg