Any Class Help Assassin And Warrior Build Help

Hey everyone!
A while ago I got a really good build from Weeb. While I still think it holds up right now, I'm wondering if there's any final changes I could make before my friend and I go to the silent expanse.
We've both killed every single quest including Qira besides the final few SE quests.
Right now, i'm a level 100 assassin with a spell-spam build. Here it is:
wynndata.tk/s/ply6o1
(I did keep some of my old gear such as the leggings because i was really lazy)
I would definitely like a replacement for the trench scourer, I know the mana steal is a huge waste.
It would be really nice if I could get more survivability. I heard that a lot of the assassins have over 10k hp during endgame.
I still want to keep or increase my dps, but if I need to sacrifice some for more survivability I can do that.
My friend also wants a build, he's a level 100 warrior with a tank fire build.
wynndata.tk/s/nfjt96
He prefers to keep the Obsidian Framed Helmet, but if theres a better alternative then we could go for that.
We're getting tier 6 fire powders on his Apocalypse right now.
Right now, I deal out a lot of the damage while he tanks all the shots.
Thank you for any input!
Swellpear and Thydoge27
(sorry for the prefix)

 

both of the two links are the same

 

sorry about that, i changed it now

 

My favorite tank build:
https://wynndata.tk/s/t493cq
(you can prolly replace Prae with apoc with few problems though)

If you wanna keep t6 fire powders, I recommend doing an apoc tierstack, not heavy melee: (if you are using melee builds with super slow speeds T6 earth powders are better than T6 fire powders)
https://www.wynndata.tk/s/5jqi30

I think Weeb has an amazing apoc tierstack, but if I remember correctly it requires an item that’s hard or impossible to get rn:
https://wynndata.tk/s/0exc85