Glad to hear you got your accuracy problem solved. I've never owned or shot the model 7 but i've heard they are accurate guns. I have several of the 700 models and they all shoot great and shot with acceptable accuracy out of the box. I always float the barrel, bed the action and do a trigger job on every rifle i buy and the accuracy improves even more. I think you made a good choice with the boyd's stock. Their stocks are a nice looking piece of wood, i have a couple of friends who have them on their guns. Nothing like the feel of a wood stock up against the cheek.
I don't know your son's age but if thats your sons rifle and he's not yet an experienced shooter i would leave the trigger as is until he learns how to handle and shoot the gun. Good luck.