Sorry for the double post but I just thought of this.
Remove CC from electrical attacks. Instead add an on hit electrical damage bonus for people who are shocked.
This will help with the CC stunlock problems.
so it would look like this - Character A is shocked and B uses an air wand on him. A takes X bonus damage (either dependent on level or +50% of the air attack causing the shock)