Need help choosing a setup

Tweaked two of my builds, but I’m not sure what’s better
Grenado Elementalist
http://www.grimtools.com/calc/bVAv8E7Z
http://www.grimtools.com/calc/eZPzooX2
Obviously OA gain is enormous, but I’m losing a lot of Fire damage (which I depend on for AoE) and some energy (which is already lower than my non-BiS setup. 55 is enough for me to live without energy potions).
Runic Bolts Vindicator
http://www.grimtools.com/calc/M2gWebg2
http://www.grimtools.com/calc/eZP4OOGZ
Here I tweak both skills and components. 1K HP over 8% attack speed and 5% more life steal in components; Overleveled WPS vs levelling Biting Cold. Is 2600 OA enough to get crits on bosses (at least 5%)? I probably can get by with Deadly Aim if I still can crit against them.

Help? Anyone?