I wish you luck in your search.
Conscientious repair work is very time-consuming = expensive. A good stockmaker can make so much money producing a new fancy stock for a hunting rifle that he will probably not have much interest in repairing an old milsurp, however historically interesting it may be for us.
If you cannot find a stockmaker with the right kind of experience, you may well have to face up to the prospect of doing it yourself. May I suggest you search the "Restorer's Corner" forum, as there have been a number of useful contributions on stock repair over the years.
.