What I would do (or think I would do) is wait until the end of June to see if they get a new car. I would not take the demo, especially without a discount. If a car is delivered by June 30th, and it was acceptable, I'd take it. If July 1 hits and no car, I'd probably be 50/50 on canceling and moving on and waiting. If I needed a car, I'd move on; but if I was not in immediate need, it would probably be a toss up. However, that is what I'd do without being upset about a mess around my delivery, which could easily make anyone act differently.