Yeah, get rid of the Z, and get a car that you will have Absolutely NO problems with. Let me know what that car turns out to be.
And my dealer offers a car wash after EVERY service call, no matter how minor, for those who want it. I stopped in to pick up some touch up paint, and they offered me a free wash.
Some dealers suck, some don't.