I bought a 2017(ish) Wasr10 from Atlantic and currently replacing the furniture due to reports of the wood being cheap and splitting especially on the stock.
I tried placing an order with russtock.com, for a new set of russian laminate akm handguards but, due to the Corona virus they are shutdown. And not shipping any products anytime soon.
I would point you in the direction getting russian laminate or romanian surplus laminate stock sets. Be careful because I noticed lots of online dealers are pushing tawain akm laminate sets, which are probably cheaper quality than your current stock set.
Lee's Magazines has surplus laminate romanian handguards but no stocks. 14.99 for the handguards.
Apex currently has a complete stock set for 189.
"Russian AKM Wood Stock Set, With Izhevsk Pistol Grip, *Very Good*"
I would probably just buy the apex stock set, and be done with. Instead of tracking down individual pieces from various vendors.
Definitely get some new or surplus AKM screws to replace your current ones. The ones on my wasr10 are incorrect screws for securing the stock.
As for the extractor issues, Apex has polish extractors for the akm for 15. I would buy a few.