Personally I would wait for the 2021 program to be functional and file the return when efiling goes live next January ... this would make things simpler for all parties.
