No I have not replaced the water pump, but seems like that is the next thing. Rad or water pump first?

Cheers