I believe you are right, and Grace of Air would surely be a very nice addition to the team. A shaman in melee of course will also benefit from windfury. An extra Ankh is really damn nice to have. What I'm slightly afraid of compated to e.g. a druid is that I will have to wait for mana for the shaman to be effective.

Would you think that killing speed will be severely hampered with that combination compared to a warrior? I do really like the extra utility.