The safest bet is a 2011+ 35i. It will be the same experience as your E90. It also gets the 8 speed transmission which makes the 35i as fast as the older V8s.
For a good comparison chart see the last few pages of the brochure.
http://www.auto-brochures.com/bmw.html