Finally got back to this. I've split into two 1099R's, one for the RMD withdrawal and restoration and one for the Roth conversion.
I can make it appear correctly on my 1040 now only by using a Code G in Distribution Box 7 for the withdrawal substitute 1099R and a Code 7 in the Box 7 for the Roth conversion.
The explanation for when to use Code G does not make me comfortable that it is the right thing to do but it seems to work.
Any further clarification would be appreciated.
It appears I also have to create a Form 4852 to explain why I have created these substitute 1099R's.
