I think, especially if this year they are trying to get the houses to get along that the classes should be merged. Changing out every day, I.E: Monday the slyhterins get Gryffindor, Tuesday Ravenclaws, Wednesday hufflepuffs, then Thursday the cycle repeats if needed.