Tailcap Switch replacement

I would like to know about sources for flashlight parts.
Specifically, I need a tail cap switch for a TerraLux 180 and also a Fenix E20.
Customer service a Terra Lux has been no help. Repeated promises to send me a replacement tail cap, under "warranty" proved to be false. Likewise, the Fenix parts website I found made no mention of parts for the E20 light.
Is there an aftermarket source where I might be able to obtain replacement switches?
Would the "McClicky" switches possibly fit these lights?
I like both these lights, they suit my needs well, but the unreliability of the switches has to be addressed somehow.
Suggestions appreciated.

Shiningbeam has some replacement switches. Fasttech, DX and KD may be other sources. Check the OD of your current switch and use that as a reference to find a replacement. Batteryjunction could probably get OEM switches for you as well.




Barry

Those sources are all new to me, THANK YOU!
Might be a bit of a trick figuring out what ons I need, but I have a bit of time on my hands to kill!

Batteryjunction may be the best bet as they are dealers for both brands.




Barry