M3 or you'll always regret not getting it, hang on until you can afford what you really want.
I had a 335i and it was a nice car, but definitely not an M. I had also injectors and HPFP replaced multiple times. Initially I was hoping to keep the car for a while, but with these problems I got rid of it after around 50k.
2013 X5 xDrive50i | Carbon Black | M Sport + M Perf, 333M Wheels
Sold: 2012 E92 M3 | Jet Black, Fox Red/Black | DCT, ZCP