OP is in a win win situation, warranty is covering the problem, and your dealership is willing to work with you to order a new car if the problem continues. Sounds like the ideal resolution, even if the initial problem is upsetting.
Hope it all works out
