This is if anything far too tame. Firstly stop calling it the War on Terror and start calling it the Third World War (aka The War on Anti Western Forces). The principle that those who commit, aid, harbor, arm, or abet terrorist operations will be defeated must be taken to its full fruition up to and including fighting war against major nation states up and including thermonuclear war fought in a manner to win absolutely.
As for the matter of Pakistan, regime change, or outright reintegration with India should not be ruled out since the current regime are overtly involved in military operations with the PRC and overtly aid other anti Western efforts besides terrorism especially those in the ASEAN countries. As for enforcement or involvement with UN resolutions and initiatives I propose a radically different course, one of ending the UN. It has been demonstrated throughout history the unnecessary foreign entanglement especially with so called multi-lateral supranational bodies does more harm than good.
The USA needs to move back to a geopolitical strategy which was in force at the very end of the 19th century and heartily embrace strict bilateralism. The beauty of this is that multiple bilateral relationships with true friends would result in a far more effective de facto international alignment of the like minded than anything like the UN or NATO ever have.
Finally as for Afghanistan, it is urgent that we understand the fact that geopolitical enemies of the USA have it in their interests to maintain the current situation. "Ex" Red Army General Dostum is assuredly not on the side of the West, long term, nor are the many Red Chinese helpers we've allowed into the country. Again, and in bold afront the the effette, world opinion obsessed mantras of the 1945ers of the Western liberal orthodoxy, we should outright ban certain countries' nationals from entering Afghanistan, shoot on sight.
I've heard him say it; and believe me - he did not say it lightly.