A quick question, do you have a pic of the 6p switch? If I understand you correctly, if the 6p switch 'fell' out when the tail cap was removed? It was either broken, wrongly installed, or entirely a different switch I'm envisioning. It almost sounds like the it was the early z14 made for 6R...