There is no strict deadline for the issuing of a corrected 1099-R. You could use the original one. When reporting it TurboTax asks how much is RMD. After reporting the correct amount you can say you rolled over the remainder of the distribution.
