I like the first idea. That would help to focus the nature of the conflict, I think, and will let all of the player-guided houses get good impressions of each other.