Okay, I've been thinking about this, and looking back on the past swap sign up, I thought we might make the groups smaller by eliminating the shaker boxes and paper piecings (usually the last to go!).
I am thinking of doing 2 groups of 8, and two teams - one with the Lands as a theme (i.e. Toontown, Condor Flats, Downtown Disney, etc), and one that is ride specific (especially if exclusive to DL, like Matterhorn, Gadget's Go-Coaster, etc).
I will set up sign ups in August... but start thinking of ideas now and if you have any more suggestions, keep 'em coming!