Implementation of MAST devices and packet escalator should accomplish this.
This is a critical piece for reliability of opportunistic encryption, as current routing tricks cause plaintext packets to blackhole after a physical interface flap.