This.
I did all that to mine and it turned out great. Light, crisp, goodtimes. I did have to file down the JB Weld, shoot, file, shoot while at the range to get it just right. Overall I probably have an hour and a few bucks into a trigger that feels a bazillion times better than the stock one.