Did you remedy your water ingress issues?
I see lots of unanswered questions on here, too. Mine tends to be leaking into the ends of the dash, from water in the internal A Pillar covers. It was/is not the windscreen, as it has just been removed and resealed. It is not the sunroof, as I have...