My personal opinion is that the battle rifle should be brought back for regular troops. "Spray and pray" has been no substitute for good marksmanship.
The modern infantry issue assault rifle, is hardly spray and pray. It's highly accurate selective fire weapon. Selective in this case typicaly being burst or semi-auto. Automatic selective fire weapons as you indicated weren't as effective as hoped.