Keeping albums together is great if you are searching for stuff to listen to at home.
But if you use the library for DJ gigs, it makes more sense to organize by genre.
But then again, I have my songs in different folders listed by genre...
BUT... I have rarely used them that way at a gig.
I just search for the artist or the song.
BTW
I had to re-tag my entire library a few years back. (about 38,000 songs)
I did a few hours a night, and it took almost a week.
I was using MP3 TAG, and re-naming files in huge batches, usually hundreds at a time.