if you file form 4868, you have until Oct 15 to repay for 2020,
and if you don't file until then you won't have to amend your return.
I talked to Vanguard, they will have no problem taking your repayment into a new or existing IRA.
I'm sure the other big outfits will be the same.
