I have two M&Ps that improved with shooting, but I don't think the trigger will improve from "terrible" to acceptable for you.

Warrantee returns just take a couple of weeks, so I would try that first.

I expect S&W will improve your trigger. Apex parts are a solution, but S&W might get you where you want to be without additional expense.

Will