And you are correct sir. Sorry about that, too many 1099-X's floating around.
After entering it's now coming out to $2792 as predicted. For posterity, I do think you have to do the second part you suggested to get it all to come out.
I can't thank you enough for this, and hopefully this helps a few others seeking answers.
