Retirement tax questions

I have a similar question but different specifics. Here's my info:

 

  • May 2018: made Roth IRA contribution for 2018 tax year.
  • March 2019: realized when doing 2018 taxes that I contributed too much. Contacted company and pulled out entire 2018 contribution and any earnings (all were pulled out before 2018 tax deadline).
  • March 2020: received 2019 1099-R showing transaction described above.

 

Based on this feed, it seems that my transaction is taxable for 2018 even though the transaction actually took place in 2019. Therefore I will need to ammend my 2018 taxes. My specific questions are as follows:

  • Do I enter the 2019 1099-R on my 2019 taxes too?...or do i ignore it for 2019 since it will be amended into my 2018 taxes? It just seems weird to not use a 2019 form for my 2019 taxes.
  • When originally did my 2018 taxes in TurboTax, I stated that I did NOT contribute to my roth for 2018 (because I took out all the money I put in before the 2018 tax deadline). Is this correct, or should I have somehow indicated that i contributed but took everything back out?

Thanks!