There's also Osaka castle.

I would argue for at least a late evening in Kyoto. It's interesting to walk along the river and especially in the famous geisha neighborhood in early evening. Kyoto also deserves more than one day.