After you file

Yes wait for the IRS to process your return and debits your payment.  They might catch it and fix it for you.  But you may not need to amend.  How much is on 1040 line 6b for taxable Social Security?   Is it zero?