I would like to vote for option A as well, since that would be thematically consistent with other similar civs, like Rome being Rome, yet having Mussolini. If a modernish Mexican leader can be added as well, that would be splendid, though of course it is subject to your whims and the availability of resources to add another leader.