Damn, that sucks. Good luck with your Audi, only Audi I'd ever consider is none of them, but the A5/S5/RS5 sure is a beaut!!!
And you're right about E46 VS E90.. I could not stand the E90's window switch placement when I drove them as loaner cars when my E46 was still under warranty.. at least their front looks a heck of a lot better than the F30's grossness.