Need help to increase my DPS for Wiz/Battlemage

SS of my setup below

currently at M3 level 400+ and progression is slowing down since after 350
main damage will be from whirlwind and elem crit

is my gear good enough to last till M3 level 800+?
which affix do i need and which one i should be removing?
do i need to change out battlemage for others?
i do like the mobility that charge and teleport/shatter provides me

thanks guys