Jeff Beck gets my vote.
And for drums (may take heat on this one): Buddy Rich.
I saw Baker, and am pretty sure I saw Cobham with Mahavishnu. Wasn't impressed with Cobham, but Baker was tremendous---his early work with Cream had very little traditional high-hat and lots of plain old drum work. Quite original. Never was a Bonham fan, though he was good. Hated Moon, Neal Pert, and "busy" drummers.
I have no idea what constitutes a good drummer but....
....about half the times I was listening to some record and said, "Wow!", when I went and checked the liner notes it said Steve Gadd.