I had this noise for about 3 months after buying the car untill the fan belt belt snapped. Replaced the belt and it instantly snapped the water pump pully off. Guess the tension of a new belt was to much for it. I'd say your on the right track looking at the pump. Its a straightforwad...