I have now corrected the double counting and my numbers look much more reasonable.
I am *very* close to being ready to fill out the tax forms. I just have a couple of more numbers to track down. (You should have seen me earlier this evening hunting for the missing 2017 credit card statement stack, which included the *one* credit card where I can't get the info online.)
Fingers crossed!