It wouldn't take anything more to add 15 slots. I'd trade 5 perma locks for more classes.
flag cap smoke
gun ranking classes
there's so much crap to counter in this game, you'd have to take away your primary to cover it all.
On that note, will trophies stop a Swarm or Hunter Killer?