Your IRA custodian should be doing the attributable-earnings calculation for you when you explicitly request a return of contribution form your Roth IRA before the due date of your tax return.
You do not need to amend your 2018 return. You will enter the excess Roth 1099-R this year on your 2019 earnings. The codes in Box 7 will correctly report it so you only pay tax on the earnings. The earnings should be in box 2a.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"