Help me improve my storm shaman!

So I've been enjoying playing a storm totem shaman. I reached level 62 and got the primal Ancestral Bones offhand for the buff/minion buffs and whatnot and I have the Tempest Maw for the synergy with storm bolts/totems. I'm not interested in the Spriggan totem spam thing, as it looks incredibly boring to me, although I have the Stormcarved Testament waiting for me later on (I already have a passive/afk necromancer to play).

Skills I'm having a lot of fun with:

• Gathering Storm - for storm bolt damage. I was having a lot of fun leveling with Lagonian Diplomacy but sadly being forced into using a staff was extremely limiting in gear choices. Tempest Weapon node + Tempest Maw + Storm Totem seems great so far. I only rush in to melee when I need to generate a storm stack (totems basically max out the stacks quickly to keep them going for a while).
• Storm Totem - using Unmatched Storms for more storm bolts, with all the above synergies.
• Tornado - once again, more storm bolts and this is a great boss killer and for large packs of mobs. I only wish it could be turned into a cold tornado or a blizzard of sorts (I guess I could go with fire tornadoes, but that just feels off).

Skills I'm having issues with; need suggestions:

• Thorn Totem - used mostly for fueling Thunder Totem and keeping enemies off me and the Storm Totem. Damage, by itself, is pretty lackluster but I have the cold nodes to give it some slowing/freezing procs, but it's not much.
• Storm Crows - they're good for building storm stacks and they're quite decent with damage, but they're very squishy and drop quickly in boss/nemesis/beast fights. I was contemplating switching to wolves (I have the howling helmet for synergy with storm bolts) which have some basic damage by themselves and are much tankier than crows.

Thoughts and suggestions?