Has anyone just replaced the trigger shoe on the M&P 2.0 without going with the Apex kit. I just cannot get used to the curved trigger. I had a Shield 2.0 before I bought the CORE and for some reason had no issues with the curved trigger. In fact that is what I based my purchase of the full size CORE on. There is so much pre-travel mixed with the curved trigger I can't get comfortable with it. All my other pistols have the blade trigger safety. I have no problem dropping the $160 on the Apex kit but I feel this pistol has a good trigger with a light break and just needs a different trigger shoe.