IRS allows corrections within the prescribed time limits before due date. Yes, 1040X amended would be best.
