Backdoor roth conversion pro rata mistake

Hi all,

 

I think I made a pro rata rule mistake, which I am pretty sure is too late to fix due to changes made by TCJA, but wanted to double check first. Timeline as follows:

 

3/2020: Nondeductible 6000 contribution to trad IRA with Vanguard -> Conversion to Roth IRA with Vanguard. Balance: 0 in trad IRA, $$ in Roth IRA.

6/2020: Moved Roth IRA to TD Ameritrade.

7/2020: Rolled over multiple old 401ks to new trad IRA with TD Ameritrade.

12/31/2020:  End of year balance: $$ in trad IRA and $$ in roth IRA. 

 

Now, I am realizing I'm going to be double taxed on most of my attempted backdoor Roth conversion, and it's my understanding that I can't undo or recharacterize it due to changes made by TCJA?  Is this correct, or do I have a way out here?