Need to amend a 2015 HSA Overcontribution

In 2015, I started working and contributing to my HSA. I qualified for the HSA, but while I was filing my taxes, I answered the questions incorrectly and my HSA contributions were filed as an overcontribution. Ever since 2015, I've been paying taxes on the excess amount on form 5329.

 

I would like to go back and amend my taxes, but the statute of limitations no longer covers amending my 2015 tax returns. How can I go about correcting this so I don't pay taxes again on this mis-labeled "excess" amount, without having to withdraw from my HSA?