Well if its just a matter of waiting, and if you can hold on and patiently wait for the 2012, I would say hold off and wait. However, by the look of your post it seems like you want it now!
If that is the case, I would pick option 1) if you feel comfortable dealing with the same dealership 2) if you are not sure about the reliability of the dealership as they only gave you a heads up 2 months after you had ordered
For a new 2011 base, sport, touring, anywhere in the 33k-35k OTD should be a good price. I got my base 2011 in July of 2011 for 36kOTD, I could have done better but at the time, when Z shortage was there, I was lucky to even get one.
