Kirk has improved a lot in recent times. He got very sloppy and relied on his Wah, but he's definitely got himself back up to scratch.
I'm going to have to go with Joe Satriani. I've seen him live a few times and his control and mastery of the guitar is unreal. It may as well be extra limb on...