Please note above that the bold was not my choice, as it wasn't in my post. I don't know what that happened.
I agree that Roger's serve is better and helps him more. Roger is an excellent volleyer, but Nadal is very fine. I've noted Nadal's finishing at the net, and Nadal has great drop shots, which he also uses to finish points. Arguably Nadal's are better from farther from the net. Don't start with the forehand, as they both have world-class ones. Nadal's BH has improved and has long been stronger than Federer's. I agree on Roger's DTL BH...as better, but not a shot that Rafa doesn't have. I would also argue that Rafa's running forehand is a better shot, and he's a better passer than Roger. Both are great and reliable at the smash, and I think they're equal on the lob, which they don't use as much as someone like Murray, for example, who has a great one. Oh, and Roger has the more successful tweener. LOL. But if you take my point, it's not like Roger has so many shots that Rafa doesn't have. He may be better at some, but Rafa is better at others. It seems a fallacy to say that Roger has way more variety than Rafa.