Unlikely scenario, but if the team is called the “Mexico City Diablos” but its home stadium is not actually in the city or state limits, will this resolve YES? What about vice versa?

I would say yes. For vice versa, do you mean, what if a team does not have "Mexico City" in the name, but its stadium is in the city or state limits? I would say that also resolves YES.

[MLB Commissioner] would be disappointed if A’s Las Vegas ballpark not open by 2028, skeptical of Olympics

"Manfred said a decision to expand to 32 teams could be made within five years but the new teams wouldn’t start play until 2029 at the earliest."

https://apnews.com/article/mlb-owners-as-olympics-eb8546d78d9b556488d4748395dbf584

There should be a market for anywhere in Mexico, or any other new country

This would be pretty cool!