I think we may still be short on details but it sounds like you don't have an excess contribution, just a non-deductible contribution.  Amend the 2021 return with the correct entries and see if the software throws some basis on an 8606.

A lot of folks confuse excess contributions with non-deductible contributions.