After you file

Totally agree.  And since amended returns take several months to process, waiting to file it doesn't add much time.