What A Country has GI stocks and handguards. http://whatacountry.com/stocksandgrips.aspx

Call and tell them what you are looking for. You may pay more than the price on the web page but the stock will be what you want and they will match a handguard to it. They don't have rare collector-grade stocks (for the you need to go to Riverbank ) but I got a decent Underwood and RMC-B stock from them.