Toyota REALLY dropped the ball on making it 'clear' what oil is to be ued in various Toyota cars over the last 5 years - TSB's that cannot always be found, oil caps that read different on the same car, dealerships that tell you different things.....
I'd want to keep it simple - use whatever it says on the actual oil cap. That way, if for some reason you have a problem that involves oil, you can pop the hood, point to the cap, and say "I used XW-XX, JUST like it says to RIGHT THERE".