How to fix the Energy Weapon problem

Energy weapon rarity does seem to be imbalanced. I'm seeing drops with four or five volts or havocs in the same location. The loot distribution appears to be too random, and thus really clumpy. I see a lot of bins with no guns, and many  containing three or more of the same item (such as a blue evo). Combined with new shield rules, season 6 is less tactical and more frag-fest. It's become a game of chance, and that's not why I signed up to play.