I think those are all right....
Anything outside a 1 vs 1 and 2 vs 2 = gimmick match, so there are a LOT of 8's that should be 12's and 20's that should be 24's.

Now why did I leave those out?? Highly odd. Not least because I'm doing
myself out of some points....