Finally got around to fitting the new pump today. I've been on night shifts and also waiting for some parts for the exhaust manifold, which I wanted to sort out while the water pump was out. Anyway, the new pump has cured the overheating problem, as expected.