[Help] Oro's Chieftain Cycloner

As mentioned in the title I need some help with this build.
I want to use it in either SC or HC in the new league.

Check out my profile for skill tree and current equipement.
Character is called Foshizzlemahdizzle.
Skill tree can also be seen here: poeurl.com/Dew
We don't know what the next content update might nerf or buff, but I wanted to craft something already anyway. If they don't change the pathing of Chieftain the two new points would go in to Tawhoa.

So I already tried the build with some cheap equip I found in my standard stash.
IMO this build is able to do maps up to T9 with some struggle.
But advancing any further than T9 might be a problem.

Hence I'm here to ask you how I could further improve the build, skilltree, gear etc.
One of the possible upgrades I thought of was to simply link there Oro's and switch the Tabula for a Kaom's to get some dmg, health and armour.
In addition to that I also thought about using the The Taming + Emberwake combo to increase my damage and make advancing less of a struggle.
Those are definitly not the cheapest upgrades, but in my eyes those are the best ones and they are still pretty achievable.

Looking forward to some help and discussion, thanks in advance.

€: Experimented a little bit and changed the gem setup + tree of my char.
Now I just have to wait till Perandus ends since I got myself a 6-Linked Oro's and a The Taming waiting for me.