A quick and easy fix to this problem is make primary weapons more primary. Limit shotgun and sniper ammo caps so no player can hold more than 10 rounds at any given time period. This includes nullifing ammo perks involving these weapon types so that no player can use their secondary as a primary without being incredibly accurate. If you don't agree then explain why this wouldn't work. What other way can gun skill and decision making be promoted without making secondary ammo more valuable without increasing its drop timers in a match???