The swap could use the size requirements from a Turning Twenty as the basic options. (Not sure what they are, but there seem to be squares and rectangles.) Whichever there are more of, the other shapes can then be filled in accordingly without having to think of them a lot.