24 hour transit one way, 72 hour transit back

Hi guys, I would like to travel from Auckland to London and transit in Shanghai for 2 hours on the outbound flight but on the way back I am flying into Guangzhou with the 72 hour free transit before leaving a few days later back to Auckland, via Shanghai (standard 2 hour transfer) - is this possible?

getting hold of the Chinese Embassy in London seems largely impossible.