This is what I was trying to get confirmation of. I'm not sure I found anything useful in 8606 but 1099-R instructions I think confirmed it
My understand now is if I rolled over $10k and $8k was contributions to my Roth 401k, It would show the $10k in box 1, the $8k in box 5, H in Box 7, and...