Paideia
Warlord
Except we are running out of leader spots!
I couldn't agree more. Personally I'm hoping for Japanese and Spanish/Arab. They seem to me to be the civilization really suffering under a limiting leader personality.
BTW, I'm rooting for Meiji and Felipe II/Harun al Rashid, if you wondered..