I made up my own 1099-R with
1 gross distribution: put in total amount came out
2a taxable amount: put in the amount went up since putting in
2b taxable amount not determined: check
total distribution: not checked (still some stuff in roth)
7 distribution codes:
1st code: 8
2nd code: blank
IRA/SEP/SIMPLE: checked (not sure this is right)
16 state distrubution: same as line 1
I did type in a note explaining (as the 8606 instructions suggest).
Doing this resulted in 1040 line 4a being total distribution and 4b being the amount it went up before distribution, which is what I wanted.
IMPORTANT: This is what I did and it looks like it works, but I am a tax novice with no training and I am not confident I did this correctly, so please be careful.
