2006WhiteA6

Hi Everyone. I had a problem with a clunking noise coming from the door/dash area. After about 2 weeks they were blaming it on faulty welds in the pillars then it changed to a cross member behind the dash that had to be adjusted. A bunch of runarounds. I got the car back after 35 days in the shop, the noise is still there along with other problems that werent there before. The new problem is I have bad wind noise coming from the bottom of the front windshield at any speed of 60 MPH or greater. I know they had my whole interior out and front end and windsheld out. I assume it wasnt put back together properly. Not to mention theres fingerprints in all the material on the pillars that werent there before. What are my rights as far as lemon law what should I demand? Supposedly I have an appintment set up with a audi rep next week for him to hear the noise. Never the less even if the noise was gone I would want a new car for the fact that I was without a car for 35 days and it came back looking abused. I am pretty sure any reason the car is in the shop for more then 30 days constitues as a Lemon weather its fixed or not. Any advice?