Retirement tax questions

Thank you @BillM223 and @dmertz.

Your guidance regarding the 1099-SA code-2 that I will receive for year 2020 makes me think of another strategy:

 

Instead of removing now my 2018 over-contribution of $130, I could keep it in my HSA account, pay the 6% tax (for 2019) and address this issue on my 2020 return. 

However, will TurboTax allow me in 2020 to match the $130 1099-SA code-2 that I will receive to the 2018 $130 excess contribution? 

And if not, how will TurboTax process the $130 (+earnings) 1099-SA code-2 that will not match my excess contribution return reported on my 2019 tax return? 

 

Another way to ask the same question, will the 1099-SA code-2 that I will receive next year make it easier to fix my 2018 over-contribution then, or should I take care of it now?