I am a resident of Pennsylvania so I can't help with California; however, I did file a joint 1040X for 2020 and would highly advise against doing so if at all possible. It has been a nightmare. Our 1040X is still awaiting processing and the IRS has placed my wife in collection for the balance on her MFS return, even though all the taxes were paid with the 1040X. Good luck!
