Cleaned the throttle body again, thoroughly this time, and the idle is a lot smoother. Also, searching around the forums, the clicking seems to be the injectors, which would explain why its louder with some fuels than others.
I had another look around the spark plugs today, I was mistaken, its only the thread thats rusty, underneath just looks coked up.

Which points towards the washer fluid/rainwater getting in there. It all makes sense now I re-fitted the airbox cover... plug 1 (left hand) is exposed, and the others are covered up, it was only plug 1 that was rusty. I'm going to put some sealant around the washer jets shortly to seal those up, just in case they haven't been sorted.