Question on upgrading surefire weaponlight tailcaps for high current applications?

Hello, I have several surefire weaponlights, and I was wondering what options I have for upgrading the pressure pad switches for high current applications (3-5 amps)? I am using higher power dropins with the XML and XML2, but I am not sure if these work well with the existing swiches that surefire offers beyond the 3 amp range. Normally I would upgrade to McClicky but I don't know if the mcClicky upgrades work on the weaponlight switches either. Any one with experience in these setups that can give suggestions? The switches I use are the XM07 and UM07 series surefires with the 7" pressure pad connection.

Thanks,
Russ