I've had Fulton Armory do NM trigger jobs for me with good results. Some reputable Armorers say that TG/Stock lock-up tension is a critical factor when match-prepping a trigger which means that they would require the entire rifle to be sent to them for a NM trigger job. Good luck with your shooter.