You can amend 2017 after filing 2018, but you need to make sure that your 2018 Form 5329 shows on line 9 the $6,500 of excess contribution carried in from line 16 of the amended 2017 Form 5329 you will be filing. Don't wait too long to file your 2017 amendment.
