Rework of "Random Leader" algorithm during game set-up

[void fog]

I would like to have a "more historical" option for random leaders during the game set-up.

I think the current algorithm works like this:

1. Roll for leader
2. Select historic/geographic civ choice
3. If 2) is not possible, select strategic civ choice
4. Roll for next leader
5. Select historic/geographic civ choice
   ...

This leads to strange scenarios, in which for instance first, Charlemagne is rolled and is selecting Rome, then Augustus is rolled is selecting Carthage.
Now I myself like my games most then the 3 civs follow a historical/cultural path and the leader has a connection to one of the three civs. (Don't get me wrong I really like the idea of evolutionary civ switching and prefer to playing the same civ all the time.) Therefore, I would like to have an option during game set-up to change the algorithm to something like this:

1. Roll for leader
2. Select historic/geographic civ choice or civ which is on the pathway for historic/geographic civ choice
3. If 2) is not possible, re-roll leader

[random lily]

This isn't what you suggested, but I'd also like to be able to actually pick a random leader and civ rather than being always nudged to the leader's preferred ones