I understand you wanting to put the rifle back to what it was originally, but if you're using a stock with the Yugo applied numbers, it's somewhat fruitless, unless they can be removed.
Wish the Norwegian rework stock sources hadn't dried up! THAT would be perfect for your project
Nice collection of pistols! Add my name to the list of guys that had never heard of them.
Unfortunately, with your post, there might be more competition on picking some up. LOL
A quick check of gunbonker turned up a few at good prices.