Can I avoid amending my 2016 return next year (due to an excess SEP-IRA contribution) by withdrawing the excess contributions & earning before filing my 2016 taxes? How?

I made an excess contribution in 2016 to my SEP IRA.
I received a Form 5498 reflecting that amount.
I withdrew the excess contribution and excess earnings in Feb 2017.
I am under age 59.5 and I am not disabled.
I have not yet filed my 2016 taxes.
I want to file my taxes in such a way to avoid having to amend my return next year.