Went to pick up the coupe today. Did the walk-around, checking the paint, wheels, hood, interior and everything looked good, except there is a tiny tear by the driver's headrest (which dealer has already put it on the due bill). The salesman went in to prepare the paperwork so I thought I might want to go ahead and program the Bluetooth phone while he was waiting. Everything paired up then I looked up and saw a scratch on the windshield, a little to the left of the HUD area. I brought it to the attention of the salesman and the sales manager and after a short discussion, I was offered the following choices:

1. They will knock $2,000 off the price and have the windshield replaced tomorrow
2. Order a new car and it would be ready for delivery the week of Jan 18, 2006

I'm now confused. I think $2,000 off is a good discount (on top of $1,000 I already got at time of ordering). It'll have a brand-new windshield, but something is telling me no matter how good these glass people are, it won't ever be the same as factory. When I had the windshields replaced on my X5, the same people that the dealer uses did a good job, but it wasn't perfect. The wipers were too low and created windnoises. Then there is a hiss noise at the top of the roof whenever I took the X5 to about 80+ mph. However, the windshield on the 650i is lower than the X5, and it might not be a big problem if they couldn't do a perfect job.

If I could wait another 41 days or so, I'll have another one (same color and options), but who knows what else could be wrong with it (maybe a scratch on the paint somewhere, tear in another part of the seat, etc.)

Should I take the $2,000 discount and live with the replaced windshield? Or should I wait for the new one?

Help me make a decision, guys! TIA.