Thumbhole to stock and grip 922r compliant?

[justagun]

I know if I change the thumbhole stock on my VEPR to a stock and pistol grip ill set off 922r compliance issues, but if i change it for a stock and MMG or a pistol grip with wrap and its technically still in a sporter configuration will it be 922 compliant without having to change other parts?