Don't forget, up until the deadline, Form 1040X isn't necessary.  You can file another original return and IRS will replace the first filing with the superseding return. It will have to be paper-filed, of course, but so would Form 1040X.