Oh, on top of what I said, get rid of Heat Blast on MCH and just make Hypercharge reduce the cooldown of your Split Shot, Slug Shot and Clean Shot to 1.5s, and make them reduce the cooldown on Gauss Round.
Make Auto-Crossbow upgrade from Spread Shot and have it be reduced to 1.5s cooldown when in Hypercharge, too, and make it reduce the cooldown on Richochet.