I thought that I would add a note about how this problem was resolved. I drained the coolant and refilled it (properly) and that seems to have solved it. I didn't flush it because it seemed so clean. At least for a week it has not overheated. My guess is that there must have been air in there. When they replaced the water pump they didn't refill it correctly. I can't see what else it could be.