After you file

Yes, wait for the tax refund to be issued before amending the tax return.