If you file your taxes now, without Form 8911, and then file a Form 1040X to amend your return, alongside Form 8911, it'll be pretty easy. Just follow the instructions on the IRS website for those two forms, and it's simple as pie. I did it on Friday night, to amend my 2018 return.
Amended...