Hello,Shanghai Trip

I have confirmations to travel to Shanghai and Tokyo and I would like to confirm whether I am eligible for Visa Free Transit. I am a US citizen and will be leaving from USA. I am aware of the rule that your destination and departure location cannot be the same, so I would like to confirm my eligibility since although I will be leaving from the US, I will be spending the majority of my time in Tokyo before catching a flight back to US from Shanghai. Here are the details of my itinerary:

Fly from US to Shanghai and spend 3 days in Shanghai. I will then fly to Tokyo and spend 7 days there. After that, I will return to Shanghai for 2 days before flying back to the US.

So: US -> Shanghai (3 days) -> Tokyo (7 days) -> Shanghai (1 day)-> US

The reason why I am slightly concerned is because my tickets from the US to Shanghai is a round trip ticket and my ticket from Shanghai to Tokyo is also a round trip ticket. Both of these tickets are in one booking. I am worried that having them in one booking may imply that my destination and departure location are the same.

Please let me know.

Thanks,
Kevin