Understandable.  We could try the same thing by moving Lily and Leah to Gryffindor.  This would result in a few NPCs moving as well, but would still be quite manageable.  Lily would be easy to move, but not so sure about Leah, though Gryffindor has produced a few brainy folk in the past (Hermione, McGonagall, and Dumbledore were all considered brilliant.)