Some of those 'ban' SLR rifles were like that too. My SLR95 had a barrel journal for a 90 deg. GB and type 3 FSB journal.Keep what you got. The sam underfolder is a abortion IMO. Never did like the AKM profile barrel and the 90 degree gas block. A cross between a milled and stamped rifle. Kinda defeats the advantage of having a milled rifle.
I love underfolders but you have to really like them to deal with the uncomfortable stock and non precision shooting they offer.