Echoing Shock had a bunch of work done in the past week that should resolve these problems. I believe in the build that is being pushed today, regardless of what you did prior to pressing Echoing Shock, it should only actually do something with whatever button you press after activating Echoing Shock. Check it out when the PTR or beta realms are up and reply here if that is not the case.
Some covenant abilities may not fully work with it yet. The core Shaman buttons should be working with it.