I don't know if you are still having issues with the sunroof leaking but I posted just a few minutes ago about my sunroof and how it was fixed for free by the company that made it. Just something for your to take a look at if it is still an issue.