You should go ahead and file your Form 1040X to amend your Form 1040 to the correct Form 1040NR.
For the stimulus payment you received in error, I have not seen guidance from the IRS on your situation. My advice is to hold the money, don't spend it, and wait for IRS guidance to be issued.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
