Case 1:

Since you are single, you have not yet met the Substantial Presence Test, so you must file Forms 1040NR-EZ and 8843 ONE LAST TIME, with the state return.

Case 2:

Probably the best...