USF as a faction puts a lot of emphasis on the versatility of it's mainline unit - Riflemen.
However weapon upgrades the way they work now basically lock down Riflemen to the choices made... so versatility goes down the drain in some way.
Riflemen are versatile in the sense of choince between AT or AI, but they are locked down afterwards.
Instead of picking up guns from racks, implement "Weapons package" upgrade for riflemen.
1-st after any officer upgrade. 2-nd after major is up(debatable)
"Weapons package" would allow riflemen access to topical upgrades. BAR or bazooka and will replace one of the weapons.
These are interchangeable upgrades. 10s long ONLY at base sector.(20s to switch from 2 BARs to 2 zooks)
So in theory USF will be able to adapt to situation on the battlefield and be capable to switch base unit specialty depending on the context.
In terms of costs: 60 muni for first upgrade. 50 muni for second.
I guess this calls for some nefs in the light of such changes (IF they are present). But the thought is just a concept of a mechanic.