Yes. But no high priority for now.
If nothing else, introduce new QC resistant signature scheme, disable rbf for old scheme and allow for one-time conversion of old UTXO's to new scheme. I guess something like that would always work.
For now... Just never reuse a spent address.