'99 Bonneville heater blows cold, overheats. Water Pump?

Just serviced the cooling system three weeks ago. Something has been whining when the heater blows on high for about the last week. Overheated on the way home from work today for the first time. Water Pump is my first guess, but there is no leakage, any ideas?