Retirement tax questions

Thanks! You're right in that I'm not eligible to apply the excess as part of a Roth contribution or 2018 or 2019. 

 

Are these the correct steps then?

1. Withdraw excess contributions from my brokerage (leave any gains in the account)

2. Include the fact that I withdrew the excess in my 2019 tax filing

3. Optional: Contribute to a traditional IRA for 2019  

4. When I receive the 1099-R in January 2021, no need to take action

 

One other question: Do I need to amend my 2017 tax filing? If so, is the deadline also July 15?