There are players with such an incredible ammount of skill and are hurt by their choking, obviously the first one that comes to mind is Safin but lets say god ended choking, obviously guys like Baghdatis and Safin would be way higher, Roddick would also be a menace while guys like Davidenko in my opinion wouldn't be that high because the reason why they do so good is because they are consistent, not exactly special in any way.
I think number 1 and 2 would be the same, Roger and Rafa but Safin would be fighting for that second spot with rafa and also the distance from #1 and #2 would be very close.
Baggy's problem is not that he chokes, he is just stupid. He's clueless on court. He doesn't know when to step up, when to just keep the ball in play, when to takes something off his 1st serve to keep a higher percentage etc.
Safin just plains sucks, nothing to do with choking. He's happy to give the impression that he doesn't care to dig deep anymore, maybe afraid to find out that his best isn't good enough anymore, still living off his 2005 Federer win, happy to keep the myth that at his best, when he cares-> he is unbeatable.
Davydenko is a MAJOR choker.