Please don't. He's already outdamaging Genji and can stun. He doesn't need to be able to do that even more.
Also, the full drain was necessary. Other heroes ults can be completely shutdown before they get any usefulness, why should he get to repeatedly try his till it works?