You will not be happy with anything mentioned on here. Save your money, get your budget up another 500$ and get a tikka rebarreled and a different stock. Don't need a different trigger, just a yodave trigger spring for 10$.
I'd love to hear your experience with factory Tikkas being a disappointment....