I am not sure if this is all but I have 4 people in west wing, 5 in east human wing and 2 in east fey wing.
Some upgrades are definitely skippable for act 3. But there are a few missable women encounters around properties so I would encourage you to explore.