The only difference between your definition and that of the parent is that you explicitly deny the existence of state terrorism, and I don't think that is an improvement.
I think we would all be better off separating terrorism (a tactic) from identity (organization/state). Then we could categorize militant groups as whatever you want: state, statelet, militia, guerrilla force, freedom fighters, caliphate, NGO or whatever and separately discuss their tactics with respect to whether they commit acts of terrorism.
I think we would all be better off separating terrorism (a tactic) from identity (organization/state). Then we could categorize militant groups as whatever you want: state, statelet, militia, guerrilla force, freedom fighters, caliphate, NGO or whatever and separately discuss their tactics with respect to whether they commit acts of terrorism.