After you file

If the State and Local income and taxes withheld were correct on the original W-2, there would not be a need to amend the state return because of the 0 entries for State and Local on the corrected W-2.  Your employer should have left boxes 15 thru 20 blank (empty).