

Recent Visa + Changing Planes in China
Hello,
I am a student from Germany in Beijing right now and hold an X2 type, which expires on the 31st of January. My flight home was booked well in advance and is on the 12th of February. I was planning on passing the time until the 12th by visiting Vietnam.
I have a return flight from Saigon on the 10th of February, which requires me to change planes in Shanghai. Since I need a day in Beijing to take care of some administrative work, I would land in the evening of the 10th.
As far as I understand, am only able to receive the 72-hour transit in the first Chinese city I arrive in (a.i. Shanghai)? Further, I cannot get a transit type on my German passport because my X2 type expires less than 2 weeks before.
I do have an American passport as an (expensive) alternative.
What should I do?