Amending 2019 Return Due to Nondeductible IRA Contributions

2019 was the first year my IRA required RMDs. All the contributions in my IRA were made by me using after-tax dollars but I did not consider that when I answered the TT questions thus I did not figure my “basis” in 2019. On my 2019 1099-R the amount of my gross distribution appears in Box 1 and the identical amount appears in Box 2a. Box 2b has an in it, Box 7 has a 7 in it and the IRA/SEP/SIMPLE box has an X in it. 

I have made a copy of the TT steps to take to amend a 2019 return (Deluxe CD/Download). Once I reach the point where I am ready to amend the return, do I delete my original 1099-R and work my way through the steps again by telling TT that part of the IRA has  nondeductible contributions? 

 

Another glitch I discovered in my 2019 returns: I filed 2019 returns in July, 2020. Because my husband passed away in Feb., 2020, I realized after my e-file attempts failed that I had to change my name to the “taxpayer” and my dec’d husband as “spouse” and then the returns were accepted. At the same time, HOWEVER, what I did not realize until this year was that my husband’s 2019 CSA-1099-R automatically switched to my name and SS#, too. 😬 I see that there is a box to check indicating “spouse” if I switch to the CSA-1099 in FORMs in order to get that problem fixed or do I have to delete it and start over using Step-by-Step? Thank you for your assistance!