After you file

Same situation, excess 2019 ROTH contribution withdrawn in 2020 with taxable gain and codes PJ. When amending my 2019 return using 2019 turbotax premier if I enter the P code in the 1099-R it indicates that's income taxable for 2018 and so will likely tell me to amend my 2018 and so-on. Do I leave out the P code when entering the 1099-R in my 2019 return, or maybe amend my 2019 return with the 2020 version of TT or maybe something else?

Thanks