Of course if the custodian will accept a return of mistaken distribution, that's always going to be better (as long as there was indeed reasonable cause to treat it as a mistaken distribution and it is not a fraudulent return of mistaken distribution) since it avoids anything to do with the one-rollover-per-year rule.
