Should it stay or should it go?

I'd definetly go with the 318 for sure. Keep the push buttons with right type transmission if you really want but once you get the feel of the 318 you more than likely would want something in the floor to shift it with. I don't know anything about the push button or how it works but I always like a shifter in floor.