You can't run out of things to see in Kyoto in just a few days.
Some additional ideas: Nijo Castle, Sanjusangendo Hall, Heian Jingu Shrine, Ryoanji Temple. Instead of Himeji Castle, use your JR Pass and take the local train to Hikone on the shore of Lake Biwa to see Hikone Castle. Day trip to Nara.