Looking for some help building Tornado Elementalist

Hey there, this is my PoB.

Currently in yellow maps, going to be in red maps soon. DPS is OK but not crazy but the clear feels pretty good. Getting 1 shot by a few things here and there.

Mostly by the Mercenaries which I think everyone is having an issue with so that's whatever but still looking to see where to go from here to improve the build's survivability and damage.

I know I can use more resists and some chaos res but unsure if I should start looking to do crit or focus more on swapping to a block setup but most importantly looking to improve in areas that are cost effective b/c I am still pretty poor.

Any help is appreciated, thanks!