I just picked up my 2012 35i a couple of weeks ago and am very happy with it. We also went through Pentagon Car sales. It took over 3 months from order to delivery, but the overall price made it worth it I thought. I'm sorry to hear about your electrical issues, I certainly hope that doesn't happen on ours.

If you don't get completely screwed on your resale, then try and sell your current 35d and buy a new one. Consider the 35i as well as the new 2012 35d, which I believe they are now taking orders on. Enjoy the rest of your time here in Germany!