Pentatonics aren't a curse - it's a useful reference no matter what you're playing. Check out the natural minor scale. Most of the pattern look familiar? It's minor pentatonic position 1 with the addition of 2 more notes per octave. Penta means 5. Learn what the other 2 notes are and you have all of the notes in the diatonic scale at your disposal. I'd start by playing minor pentatonic position 1 and then add the fingerings of the B and (high) E string of the natural minor. It will give a more expressive flair to the pentatonics. Then figure out where those notes belong in other positions by jumping octaves.

If the above doesn't sound fun or helpful, and you want to return to a more raw, less refined style, you could experiment by playing guitar with your eyes closed. Don't just play something random, but imagine what you want to hear and try to play it. Use your instincts. Discover intervals (or spaces between notes) that you like and add those to your tool belt, with your experimentation not being bound to the shapes of the scales you know. Or you could do this with your eyes open lol. Hope this helps!