Your #2 was a great choice:
2.) Tikka T3X A1 (fixed stock) with Vortex PST GEN II.
You get a great action, trigger, barrel, with prs style folding stock. Esp if you buy used off gunbroker. I have seen them $1200 leaving a good bit for a scope. PST is fine, Bushnell DMR, Athlon... many more. Get a real bipod though... no airsoft clones. I think you are already going in the right direction. This set up can run with any of the $10k setups... I should know.. I was always a AI fanatic and got tired of being obliterated in matches buy guys with off the shelf remingtons, tikkas, and rugers. The hard rock guys know exactly what im talking about.
i think I might go Nightforce SHV at the pst price point. But be sure and look here for vendors making those black friday deals
I just sold off my high end gear and decided I cant do worse with a APO saber M700 set up exactly like you are looking at. The snipershide rifle they currently making is also a great deal.