Zealots will zealot. That is less of a religion issue and more a societal one. People will find something to be fanatical about and religion is the perfect candidate for that, the distance between belief and fanaticism is the easiest to cross. While it’s worth the while to fight extremism, this is more of a maintenance than a completion exercise. With the challenges of our times, as different as we may perceive them, this may be a tough exercise and not necessarily one where focusing on “fixing”religion is the most promising path. The happy times of prosperity and atheism were also the best times to be in a religion. I think the most promising path is to help people not need a God that saves them from the challenges of their day to day lives.