I'll bet you like the grip on your M&P better. I had a Glock 23 & 21 which I carried on duty when I worked armed security & I gave to my son when I retired before we had a concealed carry law. I loved those guns & shot them both well. When WI got a concealed carry law 2 years ago my son recommended an M&P40C to carry. He carries a FS M&P40 as an LEO & found that they were just as good as his Glocks (which he still carries off duty) & the grip made them better. I'm a believer.
I don't think someone can go too wrong with either M&P or Glock as far as reliability & plain ruggedness goes but my choice would be M&P every time.