I hear you.
Sub only, shorter rounds, I also liked the system they use in the 8 man event I heard about where the more aggressive you are, or the faster you tap a guy, you get a "Buy" or whatever, but that only works if they are competing for first with multiple matches.
When it is one superfight after another, that format wouldn't work.