2011 Good Will buy back? And 2011 vs. 2010 i..

Latest on my used search. There's a 2010 30i local that has roughly 30k~miles on it that has the tech pack and a few upgrades leather - dual backseat climate etc that I think I can get for prob 36k.

However a dealer just called me out of state that I've been going back and forth with that said he found a 2011 35i on auction that had 16k miles on it and roughly same upgrades that he could prob get to around 40k for me. Here's the catch, and to his credit he was very up front - the car was a goodwill buy back from the BMW dealer due to several complaints from the first owner. Basically they went through a slew of troubleshooting and replacements parts including replacing the DME (brain computer) and eventually they replaced a cam sensor? and it has been running problem free for 3 months.

So question here - all things being equal - pay a few $$ thousand more for a newer 2011 knowing the issues (Keep in mind I plan on getting a 100k bumper to bumper warranty)?

Or go with the 2010? I like the 2011 b/c of the new engine and better mpg - and these apparantly 4000 new parts lol... So multi question - knowing this are the 2010 i's that much inferior to the 2011 i's? Realizing that is prob a subjective question. And sorry if I'm asking too many questions. I promise once I buy I will contribute back I'm sure! lol

Thanks in advance,

Jason