Change the water pump, its good maintainance anyway, i did it as soon as i bought mine even though there were no problems (make sure you go for a decent spec pump not a crappy aftermarket one), then see if the problem persists.