Yeah, religion should be different from the other things. instead of having catholic and Protestant you could Medieval European or something like that, and then you start with a suitable religion for your choice (Catholic at the start for Med. Europeans, Polytheism for other civs, then they can change it like a government when they get the right tech, wonder or even if they conquer an enemy with it. There also could be missionaries in the diplomacy section, ready to cause disorder unless you convert.