I've been to China many times, but never to Japan. So any advice from me comparing those two would be pretty useless. Nevertheless, the general answer to the question is very simple.
Tell your girlfriend all about your experiences in China (the good and - even more important - the bad things) and let her decide.
Well, that's what I'd do if I were you....

Cheers,
Torsten