have you considered Replace X25519 with a post quantum cryptography key encapsulation mechanism like kyber or saber?