Retirement tax questions

Perfect answers - Thank you so much!   Additional questions we are almost there:

Question 4:  2019 1099-R should be filed under 2018, and then Amend the tax return.  

Question 5: Should I remove the 1099-R from the 2019 filing since, I'm filing it under 2018, or file it with both 2019 and 2018.  

Question 5: Do I amend both federal and state returns for 2018.