How did things work out for you at the dealer? I'm asking because I have a 2010 s40 with the same problem. The sunroof drain tube was disconnected from the firewall and I fixed it. I confirmed the fix through testing. I'm still getting water in the rear passenger floorboard after rain. I'm wondering...