It still might be the problem, as the "clicking" is only a quick check. There might be splits in the wires etc. Haynes details the micrometer test for the switch.
I presume you've already tried to lower the idle with the idle screw and CO2 setting ?? (Is it a 8v or 16v, you don't mention it above??)