You don't have to actually get rid of the supers, just change it to either long press super for the roaming version, e.g. nova warp & top and bottom tree solar warlock. Also, in the case of the solar warlock, let it be able to slam the sword for well and pick it up after you have slammed it to switch to roaming. It would make pvp much more dynamic with super usage since you would have to take into account more ways people could use their supers.