Option to disable weapon auto swap

I'd really love a simple option in the gameplay settings that disables auto switch for picking up weapons and ammo depletion.  It's gotten me killed a few times when I pick up a new weapon or auto s...