You are correct. 922r says you have to have 5 US parts or 6 if the barrel is threaded.
Most people change out the FCG (3)
PG (1)
Stock (1)
The handguards only count as one even if they are actually two parts.
You also can keep the great triggers the MAK comes with by replacing the magazine...