I realized that I had holiday music in a different bin and retrieved that as well. I suspect there's probably an additional stash of discs up on the third floor. I sort of remember a thin stack of them on a bookshelf.
The end is definitely in sight. While I continue to have a lot of network errors as match tries to update, it is keeping up well enough that I am not worried about it (much). I'm currently at just under 8000 tracks, of which around 1500 have uploaded.