After fixing Government, Labor and Economy I refuse to be done in by something as trivial as religion! This can't be too hard, I just have to approach it from the same way as I did the other categories: What ways of dealing with religion are there? You can have a Pantheon, you can have a state religion and tolerate other religions, you can have a state religion and not tolerate other religions, you can have no state religion and tolerate all religions or you can have no state religion and not tolerate anything because you have a modern ideology instead.
The Religion civics henceforth shall be:
Pantheon (Polytheism, no state religion, see Ancient Greece or Aztecs)
Theocracy (Theology, see pre-modern Russia or late Medieval Spain)
Tolerance (Philosophy, see Mughals or modern Sweden)
State Ideology (Nationalism, no state religion, see Soviet Union or Nazi Germany)
Secularism (Liberalism, no state religion, see USA or modern France)
State Ideology then might get its own unique victory, something about having no religion in most cities like Pantheon, something about culture and maybe something like have most of the world follow the same ideology as you do by running similiar civics, e.g. if you are communist they should run Central Planning without feudal civics, if you are fascist they should run Totalitarianism without Central Planning etc. I'll just use the same criteria dynamic names use to determine what ideology a civ is running. Or maybe I could just implement something like make sure most the world has no state religion and/or have pleased or friendly relations with religionless civs.
And yes that means half of the religion civics are about not having a state religion, but since one of those is about accepting all religions and another about worshipping a local Pantheon I figure that's good enough.
Edit: Alternatively I could leave Organized Religion and remove State Ideology instead, because I can't think of any civ with State Ideology that wasn't also running Totalitarianism, so it might as well be represented by Totalitarianism + Secularism. You could then have a middle of the road way of organizing your state religion, between tolerating everything like modern Sweden or modern England and persecuting all of the nonbelievers like conquistadorist Spain or Saudi Arabia. So in the end the only difference between that religion category and the one from DoC would be that Scholasticism is renamed to Tolerance.
I envision something like this:
Organized Religion: Monotheism, Medium Upkeep, extra production for buildings with state religion, +1 unhappy from non state religion
Theocracy: Theology, High Upkeep, extra production and XP for units, +1 happy from state religion, double priest slots, +2 unhappy from non state religion
Tolerance: Philosophy, Low Upkeep, extra great people birth with state religion, can train missionaries without monastery
Secularism: Liberalism, No Upkeep, +10% Research in all cities, can build wonders of any religion, no state religion