I had a similar problem. I used to try to organise photos into folders, but then had problems with pictures which came into more than one category.
I started using Shotwell Photo Manager about a year ago, and I really like it. Unfortunately, I think it’s only available for Linux, so that may not be much help to you. Which OS do you use?