Retirement tax questions

My current 2020 1099-R has federal tax withheld in box 4 and state tax withheld in box 14 so I assume I cannot create my own 1099-R per your bullet point #2.  So sounds like I need to:

 

1.  Call my bank and have the extra converted amount distributed to me and

2.  Wait until I receive 1099-R for 2021 and then amend my 2020 tax return.

 

Is this correct?