Okay - time for an update from the OP:

Thought I had things pretty well planned out when I found out yesterday that my niece will probably be married over Labor Day weekend (when we planned to be there) so I was back to square one.

Finding flights was not easy and we ended up taking the only Business Class award seats we could find. That means we are flying Air Canada, leaving Sept 7th and arriving the 8th. The only seats I could get to return are on the 20th meaning we will be there a few more days than I had wanted.

Reserved the Ritz in Tokyo from 9/8 - 9/13. Contacted both the hotel directly and Ritz reservations and we have been upgraded to a Club level room with Club Access for an additional $100 per night above the Marriott certificate.

Also reserved the Hyatt in Kyoto from 9/13 - 9/18.

Question is what to do the last night? Do I add Hiroshima for one night (the 18th), then train back to Tokyo for the last night to rest and wait for the flight? Do I just add one more night to Kyoto? Any other ideas?

Many thanks for all the generous help.