The composition of armies in the final stages should be as diverse as possible.

As I understand from the feedback, the "only Soda" adherents didn't appreciate this diversity and, because of this diversity, they don't want to play as Hotu. But here, we are essentially preserving the diversity while limiting it in a specific game.

And it will also lead to restarts like "the wrong type of bank was generated."

You still need to scout the bank; it's not often that both types of banks are visible on the first day (and even one isn't always visible, except on Jebus). And there's no guarantee that the same combination of banks won't be generated, or even something worse. This won't add any restarts.

Ideally, you should simply allow the option to refuse both scholars and huts. This was implemented in WT, and I don't remember any complaints.

Refusal looks like an alien mechanic, while checking with visions fits more into the original mechanics.