After you file

Let the IRS deal with you concerning one thing at a time. Get the refund then amend.