Just throwing it out there, but would it make sense to combine the Hero and Great People mechanics? Hydro's list contains overlaps for all the Great People types so there's something to consider 
Also:

Also:
Expansive (Req City Planning) = Hero ? (Conqueror ?)
Imperialistic (Req Nationalism) = Hero ? (Royal/Imperial/Governor ?)