I agree OP's analysis of the ability and support his suggestions. (Yes I liked his post too.)

Rolling the movement-speed increase into a passive effect would be my first choice. It would be better for everyone.