How big of discount would make the potential problem wind noise worthwhile to you to keep the one you have as opposed to waiting another month and a half for a new one that may have other problems? If they're willing to give you $2000 that quickly, obviously they don't want to keep the car in their inventory; it costs them money to do that. I would see how much of a discount you could get from them. If they're not willing to budge, then get a new one if you can wait. That's the Chinese part of me talking. On the other hand, with the amount you're paying, you shouldn't have to deal with an ongoing problem the windshield replacement may cause. Just as long as there is no other major issues, another tear or a scratch in the paint can be repaired without sacrificing driving enjoyment.

__________________
If you feel the need to bash/rag/insult/demean someone, please read this before you do. Thanks and have a great day!