[AM/Shaman] Class Mechanics

[Ysaran]

AM/Shamy does really need a class mechanic rework or it's just a matter of fine tuning some skills/tactic?

I think that some fine tuning could already do the trick and I've already made a proposal in the BDF:
viewtopic.php?f=95&t=42548&p=452750#p452750.
But, actually, the class mechanics feels cluncky, so maybe a rework is in order.
What do you think?

P.S. I might have come up with an idea for the mechanics rework, but I need time to write it down.