Did I understand you correctly?
Yep. I just didn't have the background information for your reasons to be in MA and wasn't making any assumptions. Looks like you got a handle on that though.
Just be advised that "sometimes" it matters which state you complete first when dealing with part year resident returns for two states. In case it matters in your situation, always complete the state returns in chronological order. Weather it matters or not depends on the details of any reciprocal tax agreements between the states involved.