When Ol' Roy developed a new noise - squeaking/whine - I assumed it to be the water pump. It had just been replaced and the noise didn't exist prior.
Well, it turned out to be the generator. During Ol' Roy's overheating episode, the generator got wet with coolant. I don't know if rust had started somewhere or what but it didn't affect the charging or anything and after about 6 months or so, the whining went away on it's own.