Religion is a biproduct of the real problem though, not the actual cause. I realize a lot of Atheists blame Christianity for the ills of the first world, but really, these stem from a lack of education and quality of life.
If we improved the living conditions, happiness and intelligence of the average citizen, Religion would shrivel up. Maybe not disappear, but it would be practiced entirely differently then we see now. It wouldn't be this constant and misguided opposition to social change and scientific facts like it is now, it would just be a 'spiritual' element to people who don't allow it to interfere with their reasoning skills.
That's a world I want, and if anyone wanted to try and twist that into 'lol your so entolrent', then they're f**king idiots grasping at anything they can find.