fshaw do you like the shortened stock? I might just replace that with something aftermarket - could make things easy.
Stocky's sells decent looking walnut stocks with bedding blocks so you aren't necessarily locked in to synthetic. I have tried both on my 700. Just a thought.
Trigger tech is a good option for a trigger. It is what I replaced my 700 with. I had my factory trigger adjusted perfectly but felt better replacing it since I will one day hand it down to someone nowhere near as retentive as myself.

When a country is well governed, poverty and a mean condition are something to be ashamed of. When a country is ill governed, riches and honors are something to be ashamed of
. Confucius