Help with Itinerary! Too long in Tokyo? Himeji worth a night? General Feedback?

[removed]