If that fwt stock fits you well, I'd personally think long and hard about a mcmillan fwt with the edge technology. I had a compact edge and didn't care for the stock fit myself. So much so that I sold the rifle.
For myself, if I was going that way (mcmillan stock) I'd thin about a sako classic with the edge technology, I believe they can be inletted for a winchester.(one of the many advantages of mcmillan stocks)
Best bet is being able to handle several stocks to see what suits you, before dropping $500+.
One primary reason I am running a couple remington 700s right now is that there are several stocks for them that fit me very well, but that's another discussion!