I still want to remove Pakistan’s “major non-NATO ally” status though.
I strongly suspect, that if that were to happen, Pakistan would move far more into the Chinese camp. That doesn't make it a bad idea, but it's something that has to be borne in mind.
Which is why what the US does with Pakistan ultimately depends on where proposals for a US-Indian alliance go, IMO. Most strategists would be happy to "trade" one for the other on the developing Cold War II map, especially now that the US is out of Afghanistan, but despite jumping pretty far down the crazy Hindu nationalist rabbit hole and souring even more on China, India is pretty stubborn about non-alignment. When the Quad becomes a more formal thing, the US dumps Pakistan fast.