Personally, I'd go with the new sedan. The 2 liter turbo is faster, super efficient (36mpg matches my 335d!), and will be tuneable. The new car has really grown on me too.
This car with a 6 speed manual would be pretty sweet too.
Just my $0.02. With $4 gas around the corner too, something to keep in mind.