Splitting the 1099-R worked perfectly. I've added a note to document how & why this was done, but the end result is that the RMD and rollover portions of the distribution look exactly like they should. Thank you for the advice!
