The end result is correct. It's that you've left out that code N for the recharacterization on that first 1099-R. But it gets the bottom line correct doing it your way and it should be just fine.
@TomDx
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
