eldequello,
your story I know well and have heard it repeated more than I have ever cared to hear from vets from Nam to the present. The M-16 from the 60's to any present configuration is one of the biggest p.o.s. given to the American fighting man since the French gave us a machine gun in WW1.
Current specs for M-16 variants issued to troops today allow a rifle to leave the factory as long as it groups 4" or under at 100 yards. Now I've seen beat up Garands and Springfields capable that or better and that would include any AK-47 I've shot to date.

IMHO the best combat small are to date go to the 1911 for a handgun and the AK-47. Throw them in the mud find some water and swish them around or pi$$ on them and give a shake and continue shooting. That is the measure of a true combat weapon.