[Help] With 2h Staff or Ngamahu's Flame build!

I am not sure what would be better DPS, using my current staff, or buying Ngamahu's Flame. I think the DPS is rather high for my current staff vs. Ngamahu's Flame? But the proc on that 2h axe is pretty nice.

My current gear:


Is this best Cyclone set up?
Cyclone-Fortify-Melee Physical Damage-Weapon Elemental Damage-Faster Attacks-Elemental Focus OR Concentrated Effect

Note to self-Might need Blood Magic

Passive tree for Ngamahu's Flame:
https://www.pathofexile.com/fullscreen-passive-skill-tree/AAAABAECAQSzBS0FPAd1CZYLYQ48FCAUcRR1FSAW6RiRGNsZihm0GjghVSFgIZAiryQ3JJ0nICcvKjgs-y2DMn44UzkOOlI9_ECgRrdHfkh4UEdYY1nzXhNfP1_QYVJiWmVNaFho8nKpdO108Xasdud4enrvfNmE2YTvhVKGYIdqidiKIozPkFWXBpd5mFeiAKTCqSeplKyqrY2vbLyfvTa-p78IwGbApsM6xKLE9sVTxq7G2M9-02_TfteW2WHawdwy3D3fmORR6hDqGOsJ7w7vTu968B_2SPaj9zL4X_jr


For staff, i'd just remove Iron Grip, and Lava Lash tree, and put in more dmg or something.


I Chose Beserker - Aspect of Carnage, Pain Reaver, Cloak of Savegry

Any thoughts on what I should do to improve on the tree? Gear? Is the Axe much better than my staff in terms of DPS and survability? If i get the axe, what should I link in it? I understand dont need it all linked, just 6 sockets.

bump