I think scales are a good thing to learn up to a point. Certainly the major and minor pentatonics and the major (Ionian mode) and minor (Aeolian mode) scales. It's also worth learning the basics of how a chord is constructed and the caged system.
I found the problem with scales is that they can become a trap. You make leaps when you first learn them but you can soon find yourself running up and down them for no other reason than you know them.
Imagination (IMHO) is the key. You can know all the scales and chords in the world but you need imagination to do something interesting with that knowledge. So, during practice I may try and find a new way to play a lick... "What if I use slides instead of bends?","What if I just play on one string for a bit", etc, etc... Anything I can do to get out of the monotony of running up and down a scale or the same ol, same old licks.
With chords i've tried to build up as much knowledge as I can so i'm not relying on the same old open position chords or barre chords. That's not to say I don't use them, I do a lot! But I also try and find alternatives that have a slightly different timbre. Maybe mix up arpeggiating them with strumming, etc...
And that's my weakness I suppose... I do still fall back on the same old licks from time to time. Sometimes i'm so conscious of trying to play something new and interesting I balls it up... So knowing when it's not quite working and going to the failsafe methods is a good plan!
Oh, and don't be afraid to dip your toes into styles of music you normally avoid. I've been learning a few classical pieces lately. Im not brilliant at classical but I am learning some interesting things that I may be able to incorporate into my usual style.