I say GSP. Not only is he really well rounded, but his game plans going in are always perfect and he executes them well. Unfortunately means he doesn't end too many fights, but it makes him really hard to beat. They'd need to get lucky like Serra. I haven't seen Diaz fight in a while, but he used to be very one dimensional as a BJJ guy. If he still is that bodes very poorly against GSP.