I still don't see why the religions were moved to separate techs. What was wrong with them being part of related techs - Druidism from Naturopathy, Shamanism from Animism, Tengriism from Animal Riding and so on? That way you solve all those issues at once.
I guess it helps spreading the religions across the civilizations, otherwise the leading civ(s) effortlessly get every religion.