Warrior will be fine. It might be weaker than it was in Heavensward compared to the other two tanks, but this is probably intentional since Warrior was too strong from 2.1-3.5. Warrior gained Rampart, full power Conva/Awareness(lol), and kept all of its other mitigation stuff other than Foresight. I kind of think that, other than the uniqueness aspect, a lot of your complaints are odd. Comparing Upheaval directly to Spirits Within doesn't really work unless you're comparing entire kits. I mean warrior also got what could be called "Tempered Will, but way better." Besides, your OGCD will hit harder thanks to Maim .

What you could complain about is that the Berserk AP hit will hurt Equilibrium more, I guess.

Anyway, besides Fell Cleave wouldn't your strongest potency attack be Inner Beast? Teeheeheeeeeee.