Do I file an amended return for primary taxpayer and a regular 1040 return for spouse?
Yes, you may file amended return for primary taxpayer and then file 1040 for spouse-MFS. You will have to mail both taxes to IRS.
For information on how to amend your return, see the following FAQ:
https://ttlc.intuit.com/replies/3288565