I remember my dad playing a Lenny Breau album for me when I was in my teens. I was awestruck. I really have to listen to him again.
Going back into the rock arena, there are several players who I really like, but versatility may not be their strong suit. I think that Steve Howe of Yes would fit the category well.
I've seen B.B. a bunch of times, love his tone, his vibrato and his showmanship, but the last time I saw him I found myself thinking 'Learn some new notes, man"