We've done both many times and have stayed at WL a few times. California Grill is more special. The food is fantastic at both but the views and the room at CG definitely give it an edge.
I like Jiko over AP and CG, that's our date night must go to restaurant.