After you file

Wait for the IRS to issue your tax refund before even considering amending the tax.  When it is received you may very well have a larger refund then what was filed since the IRS already knows you paid estimated taxes.