There are drain tubes that which run down the "A" pillars for the sun roof. What you need to do is open the roof and pour water into the track so it goes down the drain tube in the front right side of the sunroof . Then look for any water coming into the car. You may need to pull the a pillar cover off to follow the tube down. Hopefully this helps. By the way, sorry to hear you feel you have more problems after going in for service at the dealer.