Next 5 skill points for full offense Mage?

[Wutzgood]

With the new expansion coming out I'm trying to figure out where to put the next 5 skill points. This is strictly for pve. This is what I run now:

Fire-4/5-except last upgrade
Ice-4/5-Except ice patch
Lightning-3/5-1st and 3rd upgrades only
Clock-4/5-except exploding clock

Passives
all maxed-int, str, dex, damage

Now I'm not sure if I should max critical or go with shield for elite bosses. Does max critical give enough extra damage for it to be worth it?