Yes, you should wait until you get your refund to amend.
You may have a small balance due, but as long as you file the amendment and pay the tax by April 15, there won't be any penalty. Follow this link for more about filing an amendment.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
