Thanks guys. Finally got to unload the car this morning, and the problem is now much less severe, though still present. That probably rules out water pump & fan, and the pump was replaced quite recently anyway.