I'm not perusing your details because there is a simpler solution.
Just file your regular correct 1040 return.
Write plainly on top of page 1 "Filed after using IRS non-filers portal".
IRS will figure it out.
