I agree with not rolling your own crypto for your primary mechanism, layering it (in the correct order!) is guaranteed to be at least as secure as your stronges

I agree with not rolling your own crypto for your primary mechanism, layering it (in the correct order!) is guaranteed to be at least as secure as your strongest crypto. That's what google did with CECPQ1, they use "new hope" which is a quantum resistant algorithm with traditional methods (X25519). That way if new hope is cracked, they are still using an industry standard you'd have to crack as well.