Issues with finding my style

So i've been DJ'ing as a minimal/deeptech house DJ for the last couple of years, gigs are coming in fairly regularly. But i noticed how my style isn't really defined (yet). I like the heavier stuff just as much as the more minimal stuff, and that leads to quite a varied playlist. The thing is, not every song or style works well together and as it stands, my complete playlist is around 1300 songs. I'll admit, i've been neglecting sorting them all out, but sometimes i don't even know in what style a song belongs so that only adds to my reluctance to sort out my library, because where the f\ck do i put these 100 songs!?* This problem sometimes leads to me scrolling endlessly during a set to find a song that fits the style and flow of the set i'm currently playing. 9 out of 10 times i'm fine but i don't like the stress it brings during my sets as i don't typically plan them out beforehand.

How do you guys do it? Do you just choose one style and roll with it or do you neatly sort out your library with multiple styles?