144 hours visa in shanghai with previous layover in China

Hello,

I am currently studying in Shanghai with a residence permit that expires on 31st January 2017. I depart on the 11th January to Taipei and then to Manila and on 30th January back to Shanghai. I have my return flight to my home country (Spain) on the 4th February, so at least initially I could use the 144 hours free transit. However, the thing is I have a layover of 1h30min during my flight Manila-Shanghai in Guanzhou Baiyun International. What should I do to obtain the 144 when I arrive to Shanghai later that day? Can I ask for the 72 hour free transit in Guangzhou and then for the 144 hour free transit in Shanghai? Should I enter in Guangzhou with my residence permit and then obtain the 144 hour free transit in shanghai? Do I need visa in Guangzhou at all?

Thank you very much for your help.