What documents are needed to file with ineligible HSA contributions that have been withdrawn before the tax filing deadline?

This March, I discovered that I was ineligible for an HSA. I notified my employer, and they withdrew the money contributed in 2016 and will be adding my pre-tax contributions onto my wages for 2017. I received a corrected 5498-SA and 1099-SA, which stated total contributions made in 2016 as $0 and distributions as $0. My original W2 shows $500 for employer contributions in Box 12, which will not match my 5498-SA form. Do I need a corrected W2 that shows $0 contributions, or do I simply need to enter in that $500 as excess contributions?