The generator or water pump could be the problem. I'd suggest changing the water pump first, especially if the old pump has some mileage on it. It's just a matter of time and mileage until the pump starts to leak, so a little preventive maintenance will probably save you a possible on-the-road problem. If it springs a leak, you could be dealing with an expensive towing job, or a roasted engine.
Jerry