Travelling outside China and back (CNY Holiday) on valid Residence Permit but uncertain Work status

Question: I left company A on the 31st of last October on okay terms. I received the termination letter, transfer letter and the recommendation letter (the 3 important documents) and I was immediately hired by company B on the 1st of November. I gave them my documents to process my transfer of residence permit to to reflect my new job. It is mid February now and they still haven’t processed my visa to do significant changes in the company and wanting to go a different route as possible a manager / consultant position. It is very frustrating. I’m told everything is good with the agent they will be using, they have all my paperwork. They will maximize my residence permit as it doesn’t expire until the very end of March. Here is where I am freaked out:

I go to Thailand this Wednesday for Chinese New Year and come back 2nd of March. The HR staff and also the Western teachers have said, chill and not to worry. That everything is going to work out with visa when you get back from Thailand and submit the package with passport to agent then. I need my passport in Thailand! I have read so much conflicting information on various sites and blogs.

I’ve flown INSIDE of China in this past late December (after that that 30 day window I've read about) and nobody at immigration said anything when they checked my passport.

Thoughts? I’m trying to keep this anxiety level down.