EIP#2 goes on the 2020 return even though it was received in 2021.     Did this not come up when you were working with PS Support ?    Then again they aren't there to help prepare returns they are there to help with the program.