The 2019 Form 1099-R is correct. The combined distributions made in 2019 are reportable on your 2019 tax return. None of it was reportable on your 2018 tax return.
Including the substitute Form 1099-R (Form 4852) with your 2018 tax return was a mistake. You must amend your 2018 tax return to remove that and obtain a tax refund. Assuming you have not already done so, with your 2018 amendment you must also include 2018 Form 5329 Part IX requesting waiver of the 50% excess accumulation penalty by following the instructions on page 8 of the Instructions for 2018 Form 5329 under Waiver of tax.
