You don't need to wait until you file the amended return to do this year's tax return. However, you do need to correct the excess contribution situation in the current year or you will be penalized again.
So for 2019, you need to have withdrawn the excess or contributed that much less for 2019 than the total you were allowed this year.