I know you’re really bothered with all kind of pvp tweaks there and here, but still, there are some old as f game mode called Arena.
It has ‘reroll’ button once, after the 2nd roll your team goes into pre-fight screen with the only option to retreat if you still don’t want to continue.
Add button ‘reroll’ when it’s already the 2nd roll, which costs 1000 gold and simply restarts the Arena completely as ‘retired’. Currently I just have to make more clicks for the same result anyway.