Yeah, that's really strong. I think your version keeps the essence of the maneuver without a drastic change. I also don't like features that remove the GM's fun in the combat - I mean other than the death condition.
Do you think an easier fix might be to include that the enemy can repeat the...