Volvo Forums - Volvo Enthusiasts Forum - Electrical historical issue

I've seen many posts referncing sunroof leak causing electrical issues. Is there anyone out there who has managed to find a permanebt fix to the electrical issues caused by the leaking sunroof? I know cars get old and break down but this is a popular issue and just want to know how to fix. My 2005 S40 had the leaking issue, I know it;s caused by the drain tubes shrinking over time and causing water to leak into the car. My car has been in a come for the last couple of years because I could no longer afford the hours spent and no resolution. I've had the CEM checked and the ECU. Is there a knoen short somewhere that was caused by this? I know about the class action suit, etc. Just want to know if the solution was ever discovered by someone out there so I can get my car going again. I've taken the seats and carpeting out, even removed dashboard to try and find a short but still no luck. Can anyone out there help??