This is what I do as well, use the original file (with the filename you want to keep using and transferring each year) as the amended return.

I don't save an actual "tax file" of the original return, its wrong, so I have no reason to save it in the program like that.