I have an idea, what if we scrap religion which, in my opinion, isn't universal and replace it with the civic category of Society. This way, in a world half consumed by Free Religion, there are more options that are more universal because religion is dependant on the religions.
Ochlacracy: Is a society uninfluenced by the government, usually forming mobs and gangs within the nation.
Low Upkeep.
Plutocracy: Is run by the rich and those whom arent rich are workers or do little jobs.
Low Upkeep, +20%

in all cities, +1

in capital if losing gold.
Theocracy: A citizenry run by priests who claim to hold the divine rule.
Medium Upkeep, can build "missionaries" without monastery, cities with state

construct building and units 15% faster
Conformity: Is when the government is constantly trying to influence the people to believe what they believe through any way; propaganda, secret police, lies and empty promises.
High Upkeep, +10% research in all cities, -30% war

, -25%

birth rate
Free Religion: You can do whatever you want as long as youre not disobeying any laws.
Low Upkeep, +1

per religion in a city, no state religion, 100%

birth rate.
I didn't have the time to read all of the posts so if there are any adjustments you want to make, from other aditions made, by all means go ahead.