I fighting this same thing !! New Windshield installed with NO leaks from the windshield area now ( not sure there was one ) .. Cleared the drains and still leaking in my passenger floor / carpet. I'm about to look into a good body shop and get an estimate to graft in sheet metal and remove the...