I need to replace the terrible trigger on my so called "Performance Center" M&P 9L "Pro Series" C.O.R.E.

I would like to replace all parts of the trigger I can. This will be strickly a target gun and will not be used as a carry or duty weapon.

Is this the kit I need to order?
Details
100-B54
In The Package
1 ea. Flat-Faced Forward Set Trigger - Thin Blue Line Series
1 ea. Forward Set Sear
1 ea. Ultimate Striker Block Kit (Striker Block, Spring and Talon Tactical Tool)
1 ea. Forward Set Spring Kit (Silver Trigger Return Spring, Green Trigger Return Spring, Polymer Slave Pin, Sear Spring and Blue RAM Spring)

Do I need this Apex Polymer Armorer Block?
Details

Or this Apex Flat-Faced Trigger Assembly Block?
Details

Thanks for any help.