I stored my photos in year/month directories for years after abandoning iPhoto waaaay back when. Finally settled on Aperture a few years ago.. so I returned to

I stored my photos in year/month directories for years after abandoning iPhoto waaaay back when. Finally settled on Aperture a few years ago.. so I returned to the Finder. But I swear, with el Capitan, folders with more than about 500 photos will now beachball for minutes at a time waiting for a click. WTF. this ship is sinking.