Murray is the more complete player in my opinion. Better slice, better volleys, more variety and a better first serve.
The second serve is still a weakness though, he'll need to defend it well.
Djokovic still has a slight edge with the ROS and with the FH.
His biggest weapon is still his mental strength, he can get outplayed and still win. You're never done with Novak Djokovic!
"We get 20 seconds, Nadal gets 45!" - X-Man