The new shape isn't some time away, it's right here, 2 months at the longest and the 335i in the f30 will have the same motor as the e90 335i lci last spec which is the n55, it is the exact unit, same power output. What software were you speaking about? Nonetheless it's a great car, enjoying mine, but would have waited if I were buying now.