Do it yourself in definitly the way to go for money saving and feeling good when it shoots good.
Good barrel, trigger work and good sighting system.
Some gunsmith work is trued/squared bolt, angle on the rear of the bolt and recoil spring. There are so many things to do that it can get confusing.
Do one change at a time, see if it improves, makes worse or stays the same.
A good firearm to learn on.