State tax filing

Not correct. You only report retirement income to the state where you reside when your receive it, not the state where you "earned" the retirement.