Issue with Fidelity 1099 tax form being rejected by state

I removed a 2019 overcontribution to roth in 2019. unfortunately fidelity did not pay me the money until 2020 so the form they have provided has 2020 for the year with P & J in Box 7 to indicate this is a 2019 event. When i used it to file an amended 2019 return, the state rejected it stating that the date on the form needs to state 2019 as they do not accept Box 7 codes. I have talked to 5 different reps through the FTB CA chat and all of them state the same thing, that IRS codes to not apply to state and I need a 1099 form dated 2019.

Fidelity refuses to correct it from 2020 to 2019.

The income was claimed on 2019 and the penalty paid. I am just trying to get my state and federal tax withheld returned to me since I am due a refund for these amounts. Should I just file a 2020 amended return for the state tax withheld even though this was a 2019 event? I cannot get Fidelity to give me the proper form to do this the "right" way.