If we did get a wave of sets instead of a D2C, there is a possibility we could get another small Hogwarts with less room for multiple rooms. Personally, I think a Disney castle style one would be the best option as it would give the largest variety of rooms. They could, however, take it to the next level and release multiple non D2C sections of the castle that all combined together like the Philosophers Stone and Chamber of Secrets waves of sets which I think is a possibility