Why not update the Acquire command to include the choice of what weapon (and ammo) is available to be scrounged? (In addition to making it easier to acquire ammo from vehicles without the need for boarding, and from adjacent units etc.)
Yes, if one is in longer range combat one prefers the rifle. But, most of the CM2 scenarios are on rather smaller maps and nearly all involve assaults, so the SMG would be often preferred.