I have a FS M&P 9 which was built this year. The reset on the new production is very good. And Doug at ATEi in Taylor Michigan does amazing things the the triggers.
Another option for the trigger is Doug at ATEi in Taylor MI. Not that far of a drive for some of you and will usually do it while you wait if you set up a time ahead of time. I had him do my Shield, 9c, and FS9. Check out his web site he does a lot with M&P's.
http://ateiguns.com/