Excess Roth contribution from 2 years ago

I'd over-contributed to my Roth IRA in 2017 and paid the 6% excise tax when I filed my 2017 and 2018 taxes. Looking back, I should've corrected this earlier. What are my options now? I haven't filed my 2019 taxes yet.

 

1. Can I still recharacterize the contribution as a Traditional IRA contribution for 2017? 

2. If not, my understanding is that I can withdraw the excess contribution but leave the earnings in the account. In this case, what would I report in my 2019 taxes?