StormRaiders surge move speed only last 3 seconds...

I've been using this passive to help melee carries to stick onto targets mid lane. What I'm finding is the movespeed buff expires too quickly. Sometimes, the target will fight back while standing still. At this point the movespeed buff is useless while the duration is expiring.

Would it make more sense that the movespeed expires based on the the distance you actually move (not including dashes or blinks)? The slow resist will still be 3 seconds