as far as the water, remove your battery and tray.look there for a rust spot right thru the firewall. also make sure drains are clean there. go in wheel well behind tire and make sure the plastic skirt is not clogged with leaves. the water must hit the ground.
next do your thermostat. cheap and good insurance. also spray like greased lightning etc into your radiator and thru the front condensor. flush with hose. you will be shocked what you see come out. . Also change your radiator cap too. hth mike