I have the same situation, I am not sure where to report the withdrawn interest on the excess contribution. 

If I wait for the 1099R next year, does that mean that I need to file an amended return for 2020?

Is there a way to avoid that?