$600 for everything. I went for a ride with the shop foreman on Monday. He heard everything, and told me to leave him the car so he and his head tech and spend a day with it. He suspects the belts are on too tight, or maybe a bearing is going in my water pump - it's still the original one at 122K miles.
That's fine by me. Doesn't cost me anything, and they will give me another new car while mine is in the shop like last time. We'll see what they find.