Again what this comes down to: Is this a game or are we supposed to be training for some type of real life encounter where we are attacked by 18 to 20 "bad guys".
Lets be realistic, we all do this because it is fun, and if you take that away, why would we do it.
I, of course, say leave things the way they are. Make the shooter responsible for their own stuff. Give them the rules and let them see what they can do. And I am with Matt about allowing the shooter to choose which gun they want to shoot. The first year of this match, there were a couple of stages that allowed that and it made it fun.