Well, if i had to replace it from 1 day to another, it would probably indeed be a used car. Maybe an e92 320d. However I would try and work something out with the garage to be in a new car asap. I find a new car is probably more trouble-free the first few years..
Then I would like a 220d!!