"The brokerage said they will issue revised (corrected) Form 1099-R in mid May. "

I'm surprised they will bother to do that. The issuer doesn't always know what else happened after the distribution, nor care. If the rollover qualifies, just enter that info while working with the 1099-R worksheet. You will see the Form 5498 that proves it happened.