Going to China for two different tasks

I have applied for a X2 visa and the time I will spend in China is not more than 180 days n total.

However, I will, before I start studying this fall, be involved in a volunteer organization job teaching English for Chinese children for a couple of weeks. This I explained for the Chinese consulate when I applied for it, but they said I did not need to worry about applying to an F for that period of time since the total amount of time I'll spend doesn't exceed the 180 days limit. So I just applied for an X2.

I just want to be sure about this though, what do you think? I prefer to not get in any trouble once I'm in China... :)