Yes, do an upper and lower separate.
The most important reason (outside of cost) is the 4471.
Do them separate, and you have a "Firearm", which you can turn into a pistol, then rifle. Back and forth forever.
Buy it complete, and once a rifle, always a rifle.