Civ VII - Logical Civ Progression Through Eras

I'm looking at a logical progression of Civs though the Eras and I think we can sort of use this to predict what Civs are left in the Modern Era (I believe there is 1?) and what Civs would be coming in expansions (probably early on) as well as some leaders

So here is the map I've come up with

Antiquity: Aksumite / Egyptian Exploration: Songhai Modern: Buganda Leaders: Amina / Hatehepsut

Antiquity: Han Exploration: Ming / Mongolian Modern: Qing / Russia (from Mongolian) Leaders: Confucius + Kublai Khan?

Antiquity: Mauryan Exploration: Chola Modern: Mughal Leaders: Ashoka + it's not CIV without Gandhi

Antiquity: Mayan Exploration: Incan Modern: Mexico Leaders: Pachacuti + Frida Kahlo?

Now here's where things get a bit more interesting...

Antiquity: Khmer Exploration: Hawaiian / Majapahit Modern: Meiji (Japan) / Siamese Leaders: Trung Trac / Himiko

I don't see a way to get to Hawaii with the current civs so I think a path of Maori + Australia / New Zealand could be coming soon? Add in Queen Lili'uokalani as a leader for this path?

Similarly with Japan - this path just feels a bit weird for them so I think we'll see something like Gojosean Korea -> Heian Japan type of thing... This also leads to an Exploration and Modern Korea

From there you have a more natural path of Khmer -> Majapahit -> Siamese with Trung Trac

Antiquity: Mississippian Exploration: Shawnee Modern: American Leaders: Tecumseh

So this one just feels a bit wrong going to America at the modern age so I would personally like to see Navajo or Cherokee get added for a Modern age civ

Antiquity: Persia Exploration: Abbasid Modern: ??? Leaders: Xerxes / Ibn Battuta

This one is just weird because I don't see who the Modern civ would be right now which makes me think the last Modern civ will be Saudi Arabia

Antiquity: Greek / Roman Exploration: Norman / Spanish Modern: Russia / France / American Leaders: Augustus / Ben Franklin / Catherine / Charlemagne / Harriet Tubman / Isabella / Lafayette / Machiavelli

... This one isnt tricky persay or needs anything added to it, but let's be real, this is the path they want to use for showing off this new system