Shaman Spell Changes Ideas

First I just want to say with 1.19 not being out I can't see the class page for Shaman, so I don't know what this is exactly called.

I feel that the bounce you gain at level 2 haul (I think) is cool and all to help pull some mobs, but I have died like five times recently from mobs landing on me. Some spells now have a different effect if shifting (war scream launches you for example, and uproot pushes instead of pulls), so I was thinking how about if you are shifting you don't do this little "hop"

For those who haven't played shaman yet, it basically makes it so when you land after casting haul a bunch of mobs will be pulled to you, which I agree sounds nice, but there are situations where this just kills you (jumping up to a spot they can't get to, and then you pull them up with you for example)
________________________________________________________________
Second change idea, entirely remove the stun on uproot / make uproot work on stunned enemies. Uproot can't be used to its full power on a single enemy more than once a second. It will always do damage, but it doesn't pull enemies.