I'm less optimistic about the death of organized religion. They feel under attack and therefore hunker down and get more radical. They avoid education or simply avoid unpleasant facts.
If there is a god, I want to believe that there is a god. If there is not a god, I want to believe that there is no god.