I am more biased to the Jazz side of things:

Pat Methney - (THE MAN!!!)
Wes Montgomery
George Benson
Bill Frissell

And speaking of Mclaughlin
I was never much into Mahavsihu, but one of his early albums called Extrapolation remains one of my most played CDs. Serious hard swinging, hard-hitting jazz with some killer baritone-sax by John Surman as well.

I also dig him on the first Tony Williams' Lifetime album called Emergency!. Very trippy and lots of that electric fusion feel - but still has those hooks into swinging jazz that I love.