Retirement tax questions

Go for it.  The one other, off the wall, suggestion your CPA can consider is whether you can claim a credit against MA taxes on the same income taxed by NJ in an earlier year.  It would be interesting, indeed, to be able to attach an old NJ return to a current MA return to show the tax paid.