Drop --disable-curve25519 ?
We added curve25519 back in 0.2.4. It's proven pretty safe and reliable since then, and I think we'd agree that it's much more cryptographically secure than RSA-1024/DH-1024 TAP.
Is there any reason to keep the ability to disable curve25519 support?