Pelican M6 Tailcap mod or replacement

I have owned a Pelican M6 LED 2390 and M6 LED 2330 bothh lights are great except for the tailcap switchs which annoy me I am a Firefighter and use the lights with heavy insulated gloves.
The lack of feel and feedback is a problem and the primary reason that I bought my PentagonLight L2 which for me has a perfect Clickie (TC4), does anyone know of a replacement or Mod for the Pelican.

Thanx Guys

I just recieved a 2330 M6 and I know what you mean about the switch. Espically considering your wearing insulated gloves. Just now for the heck of it, I tried putting the tailcap of my Golston 7w (original body) on the Pelican and it fits perfectly. Though the tailcap in no way matches with the Pelican looks wise, it does have a solid clicky on and off feedback to it, rather than a pushbutton feel that the Pelican switch has.

So thats at least one option. But if a mod can be done to the original switch, then all the better.

FlashlightLens.com sells a clickie upgrade for $ 12.00. Here is a review,
http://www.flashlightreviews.com/reviews/pelican_clickie.htm

I believe the Surefire tailcaps should also work on the Pelican.

Thanx Guys
I will order one from flashlightlens.com and give it a try.