Couldn't we just replace the reference to kind 01 in the NIP-01, with a reference to the (optional) kind 1111 in NIP-22, and then move kind 01 out? That seems like a compromise.