Hi, if anyone can answer the following question/query it would be greatly appreciated.

My girlfriend and I are on a round the world trip and are currently in New Zealand. We leave for Asia on the 15th of May 2011 and are hoping to get to China either through Hong Kong in September or via Japan in October.
Does anybody know what is the best way/place out of the two to apply for a visa (tourist)to enter China. We have a flight home (UK) booked for December from Kuala Lumpur, but no confirmed entry/exit tickets booked for the China leg of the journey

Many thanks for your help