do u think the clicking sound, is from somewhere else? as I know, for my UK model. there is a heater value which located in the right hand side of the car, which will click frequently, to control the flow rate of the hot water get into the heater matrix.

have you try to clean up the throttle boddy and the air flow meter plate?