I would say stick with the 335. The M3 will cost more to maintain, high fuel cost, higher insurance, ect.
Upgrade the 335 and I think you will be very happy. You can pick up parts from people that are parting out to save cost and take the time to install yourself. It will save you money and you will know what to do if something goes wrong.