The trigger guard is in Brownells and offered in steel. As for the stock, a stock is a stock. The only difference is wether your aftermarket is a pillar bedded stock, if not keep what you got. Install pillars in that walnut, or bed it out, or both!!! And you will have the best shooting stock for that gun. Unless Boyds or others are going to set it up for that gun. As all guns are mass produced the dimensions are not the same rifle to rifle. And as you have a wood stock you do not have to suffer flexing, as with synthetics. And you are less likely to spilt a solid wood vs laminate. The laminate has less swelling in the humidity, but 4 to 6 coats of urethane and problem solved. Pillaring and bedding it your self will bring out the best in accuracy in that gun. As you can tune it for consistency in vibration and oscillation. Case and point( I have 2 mauser 98's one is bedded and floated and the other has full length bedding. First try the bed and float, if you have a consistent flyer ( Hand loads are a must here) or if it touches 2 and touches 2 a inch away, then start trying different bedding techniques until the problem is solved. Tuning a gun to it's harmonics is the key to a average gun or a great shooting gun.