Maybe I wasn't clear. I'll address your specific examples here.
You're right, these are religious wars. More importantly, they're ideological wars based off of different values, with political reasons contributing to them. Taking away religion doesn't take away war. There will always be something to disagree on and fight to the death over.
Religion has historically been pretty much synonymous with ideology, which didn't really change until after the middle ages, and it still hasn't, really, throughout much of the world. It was the big thing to disagree on. Now the big thing tends to be economic policy.
The problem isn't that a whole bunch of people are religious. That's a weird conclusion. The problem is that people hash out minor disagreements through large-scale violent conflict, and as a species we're prone to nasty tribalism on even the simplest of matters like preferred cola.