Retirement tax questions

Thank you for this excellent help. 

 

In checking Forms 8606 for 2019 and 2020 I discovered two errors in 2020: A failure to report the 2019 basis on my form and no 8606 at all in 2020 for my wife. This is surprising because I try to follow the TurboTax interview questions meticulously. 

 

I gather I should file two corrected 8606 for 2020 along with an explanation requesting relief from any penalty.

I assume I should also use the corrected basis for both of us when filing our 2021 return.