Help with New Hero's Skill... Very interesting problem

I have a hero based on the Paladin, called the Crusader. He has a skill called Vindictus, the idea behind it is the Diablo II paladin's skill, vengeance.

Basically 'vengeance' gave the pally a tri-elemental attack (cold, fire, lightning) and improved damage. Vindictus does the same thing by adding orb effects to the Crusader.

I based the skill off the Demon Hunter's Metamorphosis, when you activate level 1 Vindictus he gets a fire orb and does fire damage by changing into an alternate form, Crusader (Vindictus Level 1) and at level 2 he gets fire and ice orb together by changing into Crusader (Vindictus Level 2) and so on. After the 30 seconds are up, he transforms into normal form and loses the elemental attacks.

The problem occurs when the Crusader levels up. If he levels up while Level 1 vindictus is active, and I put a second point into the skill, then his current "metapmorphosis" will run out, and then he turns into the level 2 vindictus form.. AND STAYS THERE, getting the elemental attacks for free. Nothing can change this, his normal form essentially has become whichever level form he was given when he leveled up.

Is there any way around this problem?

Uhm... use triggers to detect when he uses metamorph, when it goes away... and add the abilities that way.. Or... is that what you're doing and I'm just not seeing it.