Honestly personally not a fan of "Utility" related things like mobility being tied into a damage OGCD, i'd rather they just be a second ogcd or have the potency/charge concept baked into the mainline one like upheaval on Warrior and leave them as a utility button you hit occasionally when needed, especially if they get more flexibility like moving to teammates as Thunderclap did