I think a simple solution would be to make invigorate its own status effect. I doubt it would be too difficult. I think it would be similar to having both Regen and Paeon.