Okay, so the only pictures I got around to posting are the ones of my newly rearranged apartment. Thanks to Marylynn for the advice, which is what I eventually did - left everything in piles and went to bed, and did the sorting in the morning. It still took all day and a minimal amount of swearing, but everything is where it belongs.
This is the best overview of the whole thing. The bookcase you can sort of see is the only one I didn't take apart, since it's all paperbacks.
This is the view from the other direction.
These are the two bookshelves that gave me the most grief. If you go to the actual photo, you can see what's on the shelves.