If you are just going to get another 335i I would just keep your car (you owned it since day 1, maintained it/detailed it so unless you are enamored with the idea of getting a new 3 series (maybe for DCT or some other random reason then by all means) I don't see the point.
If I were you I would keep the 335 and just ensure you keep up with maintenance. Everyone is quick to bash the reliability of the 335 out of warranty but it's really not that different from the 328 beyond turbos. The wastegates are problematic on early models (which doesn't affect you since you have an 09). HPFP warranty was extended for all of us in Canada as you know so I would just keep it!
I genuinely cannot think of a car out there for the price of the 335i that I would trade mine for.
Best of luck with your decision.