Need input for my buzzsaw skill tree

Hi everyone

I am planning to roll a character using 1H buzzsaw ST. As Mathil's passive tree has outdated, I am trying to build one by myself. However, the point used now is a bit too many and I'd like to seek for some help from you guys to improve it.

Tree: http://poeurl.com/zdMnAcu

I am planning to use Grace-Anger-Wrath-Herald of ice with queen of the forest and a high eva shield.
The survivability should be quite high on this one but it seems hard to complete at this point.