I don't think there's anything inherent in option 2 that says necromancer and golem wizard aren't still viable. Less common, yes, but in turn psychic control becomes more common and other builds as well. Overall the game remains quite diverse. Ideally every mage would be equally popular, which would give you currently a 1/10 chance of facing any given mage. Not all wizards go with golems or jellies, so your chances of a poor match up would be around 1/7. That's decent enough to still go with psychic control, though you will indeed be frustrated when you find yourself up against such a build. If this is too frequent a match up for you, then it can be reduced by adding new mages and creatures, increasing the diversity and vibrancy while making poor match ups for you less common.