Service Engine Soon Lite : aFe Intake??

[nespo_x5]

So I bring my X5 3.0 into service for the inspection and some little things here and there and the service adviser said there was a recall on the TCM or something and they perform the work. Then the service engine soon light comes on days after and turns out the O2 Sensors (fault code 235) bank 1 before the cat is replaced. Days later after the second pick up, the service engine soon light is on again and now I am fed up. The X goes back to the dealer and the fault code is now 235 (same as before) but they tell me its "rich mixture" and that the after-market intake is causing a rich fuel delivery to cylinders and recommend I remove the intake to clear the code. They stated they tried the a stock intake and code didn't come up. I am not sure who to believe, but I know its not the aFE!!!! period. I have had that on since 15k on the sav and its at 43k and now its a problem! please...

I have reason to believe whatever TCM or computer update they did has caused this error or maybe its a air mass sensor, I am not sure. Any ones help on this matter would be great! I really don't want to remove the aFe, thanks!