Very Nice.
I have a Colt M16A1.
If I were you, it they are original to the rifle, I would pack away the upper, bolt, buffer, and spring, and replace them.
I recently built an upper using a Colt A2 upper receiver, Brownell's 20 inch 1/7 twist pencil barrel with chrome lining, NiB coated BCG, A1 handguards, and a Kynshot Hydraulic buffer.
Wouldn't skip the chrome lining if you want the barrel to last.
And the 20 inch barrel makes for easier to control rate of fire on full auto than a 16" or even a 16" mid length.
The hydraulic buffer really tames the recoil.
Doesn't eliminate it, as that would violate Isaac Newton's Universal Laws of Motion, but it does spread out the recoil and makes it much easier to hold your target.
Also slows down rate of fire without being "choppy".
RCA