[boschmann]

The water drains are pretty easy to see & it sounds like you cleaned them out. Has the windshield been replaced (check the markings on the glass). I've seen a few leak where they're glued in, especially on replacements.