I replaced the water pump as I already had a new one laying around. The old one was a GM part and looked to be much heavier duty than the replacement. It seemed very old but appeared to be in tip top shape. I couldn't turn the propeller by hand, not sure if it's suppose to be like that.
Flushed the system with tap water. I'm going to pick up the prestone materials tomorrow and do a nice chemical back flush