I would wait until they have the options that you want. It does not make sense to go through that whole headache just to sell the car and go back again to buy another one. After reselling you might break their trust and they might not be so nice to you next time. This is again why I don't believe in buying a first year model.