Splitting the Form 1099-R seems reasonable since that's what the payer should have done. You would use code 3 for amounts received before MRA and code 7 for amounts received on or after MRA.
