I second Himeji- Osaka castle was reconstructed in the 60's and is just a museum. Himeji is an experience. The other thing I'd consider is taking one of those Tokyo days to do a day trip to Nikko or Kamakura (Big Buddha). I haven't done either (got rained out on my planned day on my last trip), but hear good things.