@Sparkz this is my list that i created and using for ladder and also in my control lineup for Tournaments.

The “official Jade-Elemental Shaman” :
http://www.hearthstonetopdecks.com/decks/jade-elemental-shaman-deck-list-guide-ungoro-standard/
is only for Standard ladder and is not created by me or has to do smth with me, i just wanted to link it for comparing them.

You can use it for both.

There are several options, i tested out some of your ideas before. This is more like a personal thing but i liked the Verdand Longneck a lot its definitely worth to take a closer look to it and maybe replace something for it. Menagerie Warden and Stranglethorn was atleast for me to slow, good for late but if you have it against aggro on your hand you have a problem.

Right, it was a second Diciple i replaced it, thanks !