I have owned both, and continue to believe that the 2.0 really is the best bang for buck. As an additional note, don't ever hesitate to buy used - lots of great pieces that have barely been used. In truth, only a small percentage have the time to really put rounds through a gun.
That said, the M&P 2.0 offers a far more usable trigger, solid sights, and rivaled performance to the Glock. For comparison, the 17 or 19 will do. The ergos are where they really shine, for all hand sizes as well. I think the advantage here is the translation to other pistols. As the ergos and angles provide a grip far more consistent with traditional pistols, I find less concern jumping between platforms. My Glock grip seems to cant far more that normal, relying heavily on the long squared trigger guard for a mechanical advantage.
The Glock is well...a Glock. Though you'd have to replace the sights if not already done, there is little else you'd have to do unless you wanted to. This is where the Glock has the M&P beat - customization. Other than that, you're really just dialing into the name and reliability. Hell, that's why I'd purchased mine previously. Haha.
You can't go wrong with either, but I would really say that you should buy what feels right. Like, physically. That'll make the difference in the way you shoot, and the enjoyment you receive. Truly.
If you have any questions, don't you hesitate.