We could have each GCD single target gets 5 espirt, similar to how Tanks have it. But then again we might also have to apply that to BRD as well as its own gauge is also RNG based.
Come to think of it, we could also make Saber Dance more like Apex Arrow and be more powerful the more espirt we have.