Library Management Question

I'd mentioned in the Tsundoku post that I was tackling my library. Which I have been doing, and discovered that I can actually put all the books in the house on the shelves properly - if I put the Zane Grey collection on top of the shelves. They look good up there. I've also dusted, which is a neverending book chore. Someday, I'll put glass shelves on all of the things. All of them! 

So with the pressure alleviated, I'm not going to do the massive weeding I'd planned on. Yet. Instead, I'm facing the final stage of managing my little home library: organization.

I'll organize the nonfiction by category - the cookbooks already have their own shelf. And antique books have their own place, too. There's a separate bookshelf for the children's books. The Louis L'Amour's are in our bedroom (along with my current text books) and I may even sort them alphabetically by title. I need to update my list on Goodreads of books-I-Own so I can check it with my phone before buying something.

I'm debating the fiction collection - do I organize alphabetically? By genre and subgenre?

What say you? What works for you, and why?