I think the 6-months doesn't apply.
This site states:
"3. The validity of the passport should be long enough to cover one’s stay in China. In some cases, it requires that the passport should be valid for at least 3 months or even longer."
From what I gather, for you it needs to be valid for the duration of the stay. Sorry, no official source though.