Maybe I misunderstand, but you could upgrade your wallet? That might still require a hop before the utxos work the right way. I hope someone clarifies.