After you file

I think you are understanding everything.  Both years you'll take a credit under the "claim of rights" doctrine and the credit in both cases will be referenced as IRC1341.