I'd stick with the S. You've already taken the big depreciation hit on your Model S, jumping into the M3 means you're going to take another one. And for a much smaller vehicle, with similar battery / range, and less screen real estate...
If you just want extended warranty, or more range /...