yeah, nip-05 improvements could help with this also by adding a third field that marks a transition event, to mitigate the possibility of the key transition event not getting everywhere your events also are
also it might make sense to augment the fields of nip-05 so that they are dated and signed, but that would be a messy upgrade