Thanks for that edit. Adding in Earth Shock was a consistent 1-1.5% improvement on each shaman. Numbers are a little rough, didn't test it much. But I ran the the old macro against the new macro and it outperformed in every fight.

Very awesome and a big thanks :-)