Weapons platoon and squad
I do not believe Army rifle platoons should have a TOE weapons squad as they currently do (or did in my day). I believe rifle platoon leaders would be better served if companies have a robust weapons platoon in order to task organize weapons squads of various configurations for attachment to rifle platoons according to METT-TC.
Sometimes the platoon needs more rockets than guns, sometimes more guns than rockets, sometimes a mortar and sometimes not, sometimes a mix of crew served weapons.
Squad leaders in the weapons platoon should be senior staff sergeants trained to advise a rifle platoon leader on the employment of any crew served weapon in the company. So although a particular staff sergeant may be the machine gun squad leader in garrison, for operations he should be able to take one of his gun teams, a rocket team, and a mortar team (or any mix required) and report to a rifle platoon leader as a weapons squad.
It would help matters if the weapons platoon leader was a warrant officer from the infantry NCO ranks; something similar to the USMC gunners but one per rifle company. The Army did something similar in Special Forces with the assistant ODA leaders; they're assistant team leaders for their career. The weapons platoon leader would be similar. This WO could also serve as a capable temporary rifle platoon leader for the duration of an operation should the LT become a casualty. A WO weapons specialist would give the rifle company additional capability and stability.
"But the West of the old times, with its strong characters, its stern battles and its tremendous stretches of loneliness, can never be blotted from my mind." - W.F. Cody