Thanks for all the replies. You guys are too knowledgeable and creating far too more questions by offering a few more excellent alternatives
After thinking it for a night, here's my preference now:
1) used m3 - if I can find the combo I want
2) C7 - if there's no crazy dealer markup
3) 235i - if BMW won't mess that up
4) used Boxster/Cayman - if the right one comes up
Way too many new models coming up in the next few months and hopefully will drive the used cars price down for a bit.
Anyone also considering a sport car in addition to the x1? Or the x1 is sporty enough for most people?