Ok. I have talked with INTUIT. They said that the correct order is to fill out the resident state return first. You can add the non-resident state after the fact and it should figure it all out.
So, I will try that. Hope it works and we are done here.
