Honestly, the most important thing for that camera is extra juice. The battery life is kinda weak for a full day in Tokyo. I would suggest picking up ...
^ This. Also, I'm pretty satisfied with my current setup even though the slot speed is a bit of a letdown. I did some informal testing a few weeks ago...