Book of Heroes

WM: Separate PvE and PvP, or separate single/group builds?

As a War Mage, I'm trying to decide if I should have one spec as the one for clearing groups of monsters, and the other for bosses (and also for PvP), or if I should do a general-purpose PvE build for both groups and bosses, and a separate build for PvP alone. I'm not big into PvP, which is why I may just use a boss build for PvP also.

Here's what I've come up with for the various options:

PvE (groups and bosses)
----------------------------
Incinerate 3
Flaming Pyre 3
Frozen Shard 3
Inner Focus 3
Icy Grasp either 1 or 3
Ice Storm 3
Time Void 3
Ice Lance 3
Fire Mastery 3
Ice Mastery 3
Snap Cast either 2 or 0, depending on Icy Grasp

PvP (dedicated)
------------------
Incinerate 3
Inner Focus 3
Icy Grasp 3
Ignite 3
Time Void 3
Ice Lance 3
Fire Mastery 3
Fire Blast 3
Volatility 3
Ice Shield 3

Now here's what I came up with for a group build and a single-target build:

Groups
--------
Flaming Pyre 3
Frozen Shard 3 (to finish off anything)
Inner Focus 3
Icy Grasp 1 or 3
Ice Storm 3
Deep Freeze 3
Time Void 3
Fire Mastery 3
Ice Mastery 3
Fire Blast 3 (redundant with FS?)
Snap Cast 2 (if IG is 1)

Bosses (and PvP)
-------------------
Incinerate 3
Frozen Shard 3
Inner Focus 3
Icy Grasp 1 or 3
Ignite 3
Time Void 3
Ice Lance 3
Fire Mastery 3
Ice Mastery ?
Fire Blast ?
Volatility 3
Snap Cast ?

Obviously I'm having some trouble with this last one. Any advice would be appreciated. I'll either do the first two builds, or the second two.

Thanks!