Does Darth Maul need some Love?

I'd like to see him with more speed but maybe use a different mechanic instead. Something along the lines of 50% chance to deal physical damage to an additional opponent when making a basic attack or Darth Maul gains 100% counter chance until the end of his next turn if receives damage more than once prior to the start of his next turn. That way he doesn't get a flat speed boost but uniquely affects a similar result depending on circumstances.

edit - another possibility, making him a little less squishy... give him def up for 2 turns after using whirling blades or foresight after receiving damage; in all cases it gives him a chance recover hp if he isn't one-shot.