You also claim that the laws of war are not applicable to the remaining types of military conflicts (with clans/tribes, any organization that is geographically spread, etc, etc).
Do you have references? [Edit: The references need to show that the laws of war don't apply to these other conflicts, too.] Also not that the world's law experts don't seem to agree [Edit: with you. See link in edit at bottom.]
(Note that by your definition we need a new word for civil wars -- at least one side is not a nation state. We also need a new word for most of the military conflicts through history -- and today. And so on.)
(Also, you shouldn't argue against what politicians say in public speeches, for the same reason you shouldn't believe advertisements...)
----
Re Guantanamo:
You ignored my argument.
Again: Afaik, you can keep combatants prisoner until after the hostilities. Which are still continuing. [Edit: This seems to be the relevant part in the Geneva Conventions -- https://ihl-databases.icrc.org/applic/ihl/ihl.nsf/Article.xs... ]
The Taliban had a government, they were a nation. So it qualify as a "war", even according to your definition.
The Taliban and their allies are still fighting.
Are you claiming that conflict stopped being a war when they lost the capital? Please give good references...
[Edit: Here seems to be the relevant definitions in USA, I saw in another place that their High Court argued that the Geneva conventions was relevant under US law also for unlawful combatants: https://en.wikipedia.org/wiki/Military_Commissions_Act_of_20... ]