I have a similar situation where I made $600 excess contribution in 2017 but withdrew in 2018 prior to tax filing deadline. I called Vanguard to withdraw the $600, they sent me a check of $672.36 where $64.40 was attributable earnings, $7.24 was federal withholding, $0.72 was state withholding. I reported $672.36 in 2017 TT under IRA section. Then in 2019, I amended my 2017 return to include the 2018 1099-R.
