Dammit. I have been looking all day! Thanks.
Theres another place that I bought my surplus stock and triangle hand guard a few years ago. I was very happy with them, let me see if i can find their name.
I have a couple Rock River A2 stocks and they seem to be well built. https://www.rockriverarms.com/index.cfm?fuseaction=category.display&category_ID=1375
These guys make A1-style stocks. I think Brownells carries them too.
https://cavmfg.com/C1-Buttstock-C1.htm