Dealer Screw-up -- What would you do?

So, I'm on the list for a 2008 Package 3 in either Pine or Mag Grey. I got on the list about 6 weeks ago now with my dealer -- Fox Toyota in Knoxville, Tenn. They initially told me that it would be a 6 month wait, so I put in my $500 and hunkered down.

Imagine my surprise, when two weeks ago, just a month after getting on the list, I called them to check in, and was told that my Prius was in allocation! The only issue is that it would be in my second-choice color of grey, but I said to go for it. At that point, I also asked about adding XM, which I was told was a port addition, so it could still be done, for $450 bucks. Fine.

I hadn't really planned to actually, you know, *pay* for the car until December, though, so I scrambled for financing and jumped through all those hoops, changing bank accounts to a new bank to get a better rate, etc. Lots of effort, time, etc.

That brings me to today, when I called my sales guy for a status/VIN check, and was told that there was "Bad News." It turns out that "everyone" is ordering Package 2 around here right now, so their inventory guy had not really looked at my request form closely, and put me in the system requesting a package 2. Woops. My salesman noticed this today. No car next week, and I'm likely going to have to wait another two months, because there's actually another package 3 request in front of me now.

We agreed to MSRP on the price, and I know that's a good deal that other dealers in our area aren't offering, so it's not like I can just go play with someone else. That said, it's a pretty staggering level of inattention to a major detail -- and it's a lot of major back and forth with my schedule and planning. What would have happened if the wrong car actually made it to the lot?

I wanted to see what folks here would suggest? I'm planning to call a manager there tomorrow to let them know of my dissatisfaction and see what they can do to make me happy, but I'm not really sure what to ask for here. Include the XM for free, maybe? Window tint?

Any thoughts on what might be realistic?

 

Until this point, I've been fine without an out-the-door price, based on what I've heard from other folks re: them being an amazingly scrupulous and good dealership to work with. After this, it's definitely been added to the agenda. Thanks.