I think any attempt to define the terms we are dealing with by examining the tools used, or how the opposing forces organize, train, and support themselves, or the tactics they use, is doomed to failure.

I think the only useful way to differentiate kinds or styles of war is by looking at the targets of force and the desired proximate outcome of the use of force.

Conventional armies can fight across the spectrum of war, to include employing terrorism. Insurgents can employ terrorist tactics, or traditional "Maoist" insurgency tactics, or they can fight conventionally. Both sculptors and demolition teams use hammers and chisels. So defining the type of war by looking at who shows up to fight it, or by the weapons employed, seems to me to be an exercise in futility.