Retirement tax questions

I have the same problem for tax year 2019.  Received the excess contribution check plus the gain on 4/7/2020 but no 1099R until next year.  The help button in turbotax suggest to file like Ireceived a 1099R instead of adding the amount to "other income".

  Also if I follow your advice, do i report just the extra contribution or also include the gain?  I think the gain should only be reported in 2020. 

Which solution should i use? Thank you.