You can add layers to a protocol definition, but it's nearly impossible to "fix" a protocol.
Email is what it is, you've been able to layer on PGP encryption since its inception in 1991, but most people don't.
So generally it's better to start with a protocol that is built from scratch with the features you want.