Ran the calculations even further (to the next triple lineup for current scenario) and it gets worse the longer the fight lasts...
Current Scenario:
0s: Berserk (50%) + Trick Attack (10%) + Hypercharge (10%) = 70%; 1.875x
60s: Trick Attack (10%) = 10%; 1.11x
90s: Berserk (50%) = 50%; 1.5x
120s: Trick Attack (10%) + Hypercharge (10%) = 20%; 1.25x
180s: Berserk (50%) + Trick Attack (10%) = 60%; 1.67x
240s: Trick Attack (10%) + Hypercharge (10%) = 20%; 1.25x
270s: Berserk (50%) = 50%; 1.5x
300s: Trick Attack (10%) = 10%; 1.11x
360s: Berserk (50%) + Trick Attack (10%) + Hypercharge (10%) = 70%; 1.875x
Total after 360s: 13.14x
New Scenario:
0s: Berserk (30%) + Trick Attack (10%) + Hypercharge (10%) = 50%; 1.625x
60s: Berserk (30%) + Trick Attack (10%) = 40%; 1.44x
120s: Berserk (30%) + Trick Attack (10%) + Hypercharge (10%) = 50%; 1.625x
180s: Berserk (30%) + Trick Attack (10%) = 40%; 1.44x
240s: Berserk (30%) + Trick Attack (10%) + Hypercharge (10%) = 50%; 1.625x
300s: Berserk (30%) + Trick Attack (10%) = 40%; 1.44x
360s: Berserk (30%) + Trick Attack (10%) + Hypercharge (10%) = 50%; 1.625x
Total after 360s: 10.82x
This is also, of course, ignoring phase changes/jumps/etc.; it would be impossible to say which one of these lines up better, but you lose less by missing a rotation in Scenario 1 than you do in Scenario 2 as it merely allows your cooldowns to sync up closer with debuffs.
I feel as though Paladin was the only tank that needed any major adjustments. It was too far behind DRK and WAR, and its new kit should really help with that. Hopefully the changes to WAR won't make it become the new PLD for this expansion and instead all 3 tanks can be used reliably.