After you file

OK, I hear you but if the Amended return is going to replace the original return, then backup the original return to a different filename.  Don't just replace the original return.  Just my two cents and should be an easy programming change.  Always better to backup file before replacing.