I notice neither one of you mentioned James Marshall Hendrix-the best of all time..but I guess that's just a given.
Eddie Van Halen
Stevie Ray Vaughan (although most of his stuff was a cop off of Hendrix, but still)
I don't think I'd list Pete Townshend though. He's one of the best composers and arrangers ever, and his stuff SOUNDS good, but I don't think he's really all that good of a guitarist. At least, definitely not outstanding. But don't get me wrong, I LOVE him and I'm a huge Who fan.