Hi!
I did a similar itinerary last summer. Definitely spend Day #9 in Kyoto--there is lots to see there and Kyoto is much more 'authentic' Japan than Tokyo is.
Just an FYI--Himeji Castle is amazing, but there isn't much else to see around there. You're right to just do a day trip there.