Ok, looks like I'm headed back to Japan on September 1st. Return home on the 19th.
Spending 3 nights in Kyoto, then a bunch between Niigata & Yamagata (my wife's family), then finishing the trip with 4 days in Tokyo. I don't yet know what hotel I'll be staying at, or even where in Tokyo...