I'm at work most of the day, I had thought water pump as this was replaced under warranty when it was new too.

Yes mate it does have those plastic connectors on the block for the coolant, I've always been dubious about them

It is a phase2 so would need a phase2 engine!