Do #1, wait until your refund and then do the Amended return.
However, do it before 4-15-2019 and pay any tax due to avoid any interest charges.
It is also subject to state tax in the state of residence you live in. It does not matter what State it was issued from.
