Both should stay exactly the same but have their duration decreased SIGNIFICANTLY. Like, more than half of the current duration should be removed. These supers should about activating round the corner from a bunch of enemies and then rushing them and clearing them out, they shouldn't be about running from one end of the Map to the other wiping the whole opposition team. This change should be in PvP ONLY though, and they never seem to want to do that.