Test your clutch fan by trying to hold it back. Compression test, see how that comes back. I would honestly replace the water pump, its most likely old anyways. Are you losing any coolant?