I made mistake for 2016 tax return, that showed I put excess HSA contribution. But I did not. I am amending it. Should I hold 2017 tax return till amendment is done?

I used Turbo Tax when I did 2016 Tax return, I might make a mistake, but not sure how that happened. The result was my HSA contribution went to 1040 form line 21 as an taxable income. And, I had excess contribution. I put in $5500 for family coverage in 2016. The limit should be $6750.

Now, I am preparing 2017 tax return, and found this problem. I am trying to do an amendment to correct 2016 tax return.

My question is, should I wait for this amendment done, then file 2017 tax return? My concern was, if I file 2017 tax return before amendment is done, and claim I don't have excess contribution in 2016 and 2017 in my 2017 tax return, IRS would find that does not match 2016 tax return.

Thanks!