I would replace the PCV valve, and do an IAC cleaning as per instructions. Just because its clicking, does not mean that the plunger is not sticking. A good soaking and cleaning of the IAC often cures most idle problems. Check for any vacume leaks while your in there.
