No, I don't think you fixed it. Taking religion out of the equation doesn't not take evil out of the equation.
If we removed "my make-believe god is better than your make-believe god" out of the equation, a whole lot of conflicts through the ages would have been avoided. Evil surely exists, but far too many people do bad things in the name of religion.