Mark
I suggest that you take the gun and drive to Stateline in Mason, NH
I visit Stateline 2 times a month. A close friend of mine lives down the road from them.. Great guys, VERY helpful, TAX FREE

and will continue to shop at stateline in mason nh.
However I have a experience that differs with Jims recommendation on a M&P 9
A close friend of mine took his brandy new M&P(few hundred shots) to them ask them to do a trigger job get rid of the Mass parts and get the pull below 5lbs. He got the firearm back and was not impressed, it did seem somewhat smoother it lost some of the pulling the trigger through rocks feeling but overall not pleased. I had a similar reaction to the trigger job when I checked it out.
He and I are both NOOBs to firearms we just didnt "know better" if anything was done, checking trigger pull and what to expect from a trigger job. And what a proper trigger job would feel like on a M&P..
So we went to S&W in Springfield to see if they would let us dry fire a non-mass compliant trigger on a M&P... They did, and it solidly reinforced our thought that better could be done on the trigger on his M&P...
So a trip to Greg Derr was in order, I went with him as well why not!!
On our road trip there we joked about greg not having a scale with enough weight to check the current trigger pull....
HE DIDNT and just said ya its more than 7lbs.. He also showed us some examples of what he does on a trigger job VS. what his gun looked like. He showed us slight evidence of some polishing of one part but overall he could not say much more looked like it had been worked on. It was very obvious with the work that greg did that there were modifications done..
The M&P came back from derr in less than 2weeks(if not sooner) the trigger is not like a 1911 but MUCH better than stock and its previous condition.
Im not here to bash Stateline, I think its a great gun
SHOP. Greg Derr is a gun
SMITH, I do think there is a difference. Both places charged $65 for the work...