That sucks that it's broke. Hopefully they'll get it fixed again.
However, I have just over 30,000 photos in my library now and I had to give up folder organization years back. I just kept running into "should this go in the Christmas folder? The Mom folder? The Chris folder? The Daniel folder? The Funny folder? The whatever folder?". Once I added keywords to all my photos, photo management became considerably easier. Of course you can't add keywords to photos on iOS, you need a Mac or PC for that (unless there's some app I don't know about). So if you just have a phone and/or tablet, it's a lot harder, if not impossible. But if you have the ability, I highly recommend reconsidering how you organize your media. It makes finding photos much easier in my opinion. In the example I mentioned earlier, I don't need to search through a half-dozen folders. I could just search for "Christmas, Mom" which normally narrows it down enough to find what I'm after. If I find what I'm after, I can even scroll up from the photo and click on "Show Photos from this Day" at the bottom to see the rest of the photos I took at that time.
That system won't be for everyone of course. Some people will never give up their folders, and that's fine for them. I just wanted to mention another possible option for those who haven't considered it before.