Comment by selfup

The end game is to switch to a post-quantum algorithm.

Essentially something that both quantum and classical computers cannot crack/brute force.

I would look into lattice-based crypto. It is one of the strongest candidates under review by NIST for post-quantum public/private key mechanisms.