Nested Tickets

Hello,

For a trip in April I have booked New York to Shanghai round trip, a total of 10 days. I have "nested" a trip from Shanghai to Osaka, Japan within those 10 days giving us a 48 hour stopover in Shanghai at the beginning of the trip (EWR > PVG > KIX) and a 72 hour stopover in Shanghai at the end of the trip (KIX > PVG > EWR). Since we are able to show proof of a confirmed seat different from our origin in both cases (albeit a separate confirmation) will this type of routing qualify for the VISA waiver?

Thank you!