[@Azereiah]
Alright, I feel that can work, especially if you were to combine it with some of the other ideas as well. This way it's still a strong ability and doesn't completely gut what makes it powerful, but there is at least a strategy around it and it doesn't completely nullify all melee encounters