The third way out is to abandon your prior years basis, forget about Form 8606 and pay income tax again on that non-deductible contribution in your golden years - assuming you ever draw down to zero.
Even with the Form 8606 you will always pay income tax on the tax-deferred earnings from that contribution.
