I’d just bring all your affected years’ tax forms to a CPA, explain your situation (I paid NYC resident taxes while living in CT), and ask if they could help you sort it all out and remedy the situation.

Like I said, it’s probably thousands of dollars at stake, so it’s worth your time to get a consultation.