Engine Whining noise?

I took the car to Aamco because mny reg. mechanic said the noise may be coming from transmission pump. Aamco had the car for a week and said it was the power steering pump and rack and pinion. The noise seemed fainter but is back. Aamco has told me the pump the put in may not be good so I should bring it back. I feel I may be running in circles here it seems no one really knows whats going on with the car while I am possibly paying hand over fist for unnecessary repairs. I ran into some water about a year ago in my car and luckily made it out and had to have the car serviced "dryed out" after wards I am wondering if their was more damage done than was repairs. Please help! Ps my head lamps are also going out on me -justthe dim all other lamos work only dim go out. I have had new bulbs put in but that did not help any. Pontiac is not a friend of mine....for the moment anyhow. :(