Encountering a similar issue now. The headliner has been removed. In your scenario, the drains were unclogged using a weed wacker line, and the water source was determined to be rust blocking the trays? If I opt for replacing the glass, does the new sunroof include an improved seal or new silver...