You've definitely done more than I had. I kept everything as disks and didn't do any other fixes.
If it's something that's going to sit around for a while and you don't care about waiting, I'll try to finish up trainer stuff, but as always, no clue when I'll sit down to do that
