By mistake Taxpayer took 2021 more than RMD amount  (by way of stock transfer to the taxable account).  Within 60 days the excess amount was returned to the brokerage account  but 2021 Form 1099-R was issued the original amount of RMD plus excess amount.  The brokerage said they will issue revised (corrected) Form 1099-R in mid May. 

In this situation, is there any remedy available before mid May?  I am thinking to extend tax return and file it after revised Form 1099-R is reported to the IRS..  

Thank you  in advance.  choi 63