Water pump, in my experience, is normally not a problem in itself (only if it springs a leak through the shaft bearing / seal).
First off, I would check, and probably replace, the thermostat; it's probably not opening properly. If that doesn't work, I would suggest a proper cleanout (remove, de-tank, ream cores) on the radiator.