In my mind (an empty place) I think you should go with the base model and here's why...
The stock gimbals are fine and will last a long time, if you do fly enough to wear them out the m7's will be widely available and at a lower price by then.
The cost difference is a bit steep for the upgrades you're getting, and that extra $100 could get you a bunch of things that will, I think, benefit you more like extra batteries or parts to fix the bird when you bang it up, and if you fly anything but ultra conservative you will break things.
Just mho.