I would agree.
I go with Al Dimeola, Stevie Ray Vaughn, and Leo Kottke, not necessarily in that order...
All greats. There are others I really think are amazing as well. Steve Howe of Yes is one of the most versatile and creative guitarists around, for example.