You reform the competition entirely to get rid of the bloat and awkwardness.
I reckon a new Super 14, with 6 NZ sides, 5 Aussies, 1 Fiji, 1 Japan, 1 Singapore, would be fantastic.
We could play Saffer sides in some global club championship that ought to be set up, with the new Super Pacific...