Have your smith do the trigger and take care of the chamber ,then you do the free float and bedding. Lots of threads on this site to show you how. It is not difficult to do, just take your time and don't skip a step. Do these things to the rifle now ,see how it shoots ,then if you still want to get a better stock go for it
and you will already know how to bed a rifle. Also you did not say what weight bullets you are shooting. My 300wsm does not like anything lighter then 175 grains.
It's a vicious cycle shoot, shoot ,tinker, shoot,shoot shoot,,tinker and on and on.