There's really no telling.
There is also mention of enhanced reliability in the RFI. I wonder what the chances are of a new upper being submitted. It wouldn't surprise me to see a whole upper being submitted.
Look I have this upper that has everything you want, it also costs about the same as the M4A1 upper plus all those accessories.