Retirement tax questions

Thank you! Just to make sure I have it right, I learned about this error last and week and am in the process of withdrawing the 2018 excess contribution now before doing my 2019 tax return. Can I submit the 1099-R on my current return and avoid paying the penalty for 2019? In that scenario, I think I’d just have to pay the penalty for 2018.