I'd wait... drex is right: There are/were some QA problems with this car. And, again, as drex mentioned, this is NOT a cheap car. Heck, even if it were, you have every right to expect a fooking perfect car! If it were a small dent, or something like that, it'd be different... but windshields... man, those are notoriously a pain in the ass to seal properly...
Good luck with whatever you decide to do.
Juan