If you can handle the waterpump in the N55, then I say get the 2011-2013 35i. There are some oil filter gasket and oil filter pan gasket that can cause leaks in the engine as well. I don't know what the injector issue is with the N55.