Thanks for the advice.

Is there a consensus on what brand water pump to get? You can get a remanufactured MB one for $200 and crap ones for $20.

Also looking online it seems the fan is a bit of a PITA to get off. Any tips there?