a simple suggestion for upcoming rounds and future wars
let say by chance in Round 1 element A gets paired off with element B twice (or more), for the next round, if A gets paired with B again, reroll the dice or better yet, remove B from the list altogether
and for future wars, if an element gets paired with another element, reroll if they get paired again
(only for early rounds of course, once the war near the end with not many teams...its a different story)