I like the current change cause I felt the great people mechanic in 6 was too overwhelming, too many options, hard to keep good track of. If they add something akin to it later, hopefully it is in a different format.
For example, maybe they could have some kind of civilian unit to great people mechanic kinda like the legacy, if you complete some objective you get a unique version of a civilian unit from a pool based on the age, kinda like a mix of great people and heroes from 6, albeit not as broken as heroes.
For example, doing something military objective on Antiquity before the age ends would get you a unique named army commander, that has some extra bonus than the normal army commander that you can keep, maybe forever or maybe just for that age.