I would go for China but make sure you leave time for a day or two in Shanghai. I was there in May/June and my guess is within 10 years it will rival NYC/London as business and tourism centers for the world.
Japan is also a great place, but the rate of change in China is so great, that you could miss out on a lot of things if you put off a trip to China.