I use Photos on my Mac and find it great for organizing. I make a separate album for each event, and label them so I can search for them later...like Susan's Birthday, 2014 Yellowstone Trip, Home Sewer Installation, etc. If you just search for one word of the album name, you can find it.
You can also associate a keyword to each photo for later searching. And more features I haven't even explored yet.
When you load a bunch of photos from your camera onto the computer in Photos, you can split them up into different albums, or consolidate with an existing album.
Do you need more features than that for organizing?
I don't know anything about iCloud, but I suppose that is what you need to see the photos across all devices.