I think inverting the passive and actives would make his kit more interesting personally. Firing off my secondary weapon at random is more inconvenient than helpful, especially because it consumes ammo.