Filed 1040 by accident instead of 1040NR

Hi there, thank you for your help!

I have a few questions on how to correct this (asking for a friend):

 

1. Is it preferable for me to file a superseded 1040NR now, or wait until my 1040 is processed and then file a 1040-X to amend?

2. Do I need to do both (file a superseded 1040NR, and file a 1040-X later)?

3. If I amend my return, do I need to submit a 1040NR alongside the 1040-X, or just a 1040-X?

4. I'm on a F1 visa and lived in California for over a year, am I considered a tax resident?


5. If I need to correct my state tax return for California, can I file a superseded return now, or should I wait until my state return is processed and then file a 540-X?

Thanks so much!