That's a mighty fine hair you're trying to split - to what end? We're in a guerilla war, and it's stupid (indeed counterproductive) to pretend otherwise.
Unless, of course, all terrorism (particularly in Israel, for example) is guerilla warfare. In that case and only that case, you're right. But I'm not going to confuse the two.