Heater core might be in need of changing, I heard of situations of that happening with new cars but it happens. As for the water sound, i'm not sure. Seeing how you posted this a couple weeks ago, did you get a chance to take it into the dealer as yet?