Have you cleaned out the drains under the cowl in front of the windshield? I would do that first before replacing parts.