Transit without visa -multiple transit stops within PRC

I am a Philippine passport holder residing in the Netherlands. I have booked a flight from Philippines to Netherlands under China Southern Airlines with a stop over in Beijing, but will pass through Xiamen first.So travel itinerary is Manila-Xiamen-Beijing-Amsterdam. In my ticket, there is no indicated stop over time in Xiamen as the plane will just pick up passengers there before travelling to Beijing. However, we will be asked to step out of the plane and probably pass through immigration and step back in the same plane. In Beijing, I have a stop over of 21 hours. Arriving in Xiamen at 2 pm, and will depart Beijing at 2:55 the next day. It is a total of 25 hours in PRC, but only 21 hours in Beijing, if I count the air travel time from Xiamen to Beijing. Will I still need to apply for a transit type? Will I qualify for the 24 hour TWOV? Do you count the time that I was in the air (Xiamen-beijing) in the 24 hours?