What about a newer shape 335 if you can find one in budget. One of the guys I mentioned that got rid of his M3 has replaced it with a 335d and says he's happier with it overall.

Plenty poke and all the creature comforts.