In jazz, since you're switching scales all the time to play over changes, solos are not in one scale. If you want to hear something that does stick to the notes of the major scale, I can only recommend classical pieces to you. The problem you face (of making scales sound like music, not just mechanical) is a problem many guitarrists face and a problem that I think a majority of metal/shred players cannot overcome. Instead of thinking as a scale as a "scale" which you go up and down, think of it as a set of notes which will create certain sounds. You shouldn't always feel obliged to remain in the scale, and you should know the intervals of the scale well enough that when you play a note, you are playing a note, rather than a pattern. I think the biggest mistake guitarrists can make in terms of being musical as opposed to mechanical is to think of their solos in terms of scale patterns, rather than in terms of notes. It's very hard to improvise well if you think entirely in patterns, because you are not focussing on the effect of the intervals being played. Check out Shay Foley's "intervallic lineage" trick to see what I mean. I think the key to soloing well is to work on your fingers, but work on your ears as well.