When most people say "terrorism", they are referring to a very specific thing, not "warfare and violence in general". You've made the word useless, just so that you can use it's connotations where they don't belong. Connotations which wouldn't exist if it was really defined that way.