Transit Visa Waiver Program

I hold Japanese national and will visit to Shanghai under the transit visa waiver program.
Could you please let me know if the following schedules can meet the requirement of the visa waiver program?

My travel plan is,
JUL 26 From Osaka (KIX) to Shanghai (PVG) by JAL 891
July 30 From Shanghai (PVG) to Seoul (ICN) by OZ362
July 30 From Seoul (ICN) to Osaka (KIX) by OZ116
or
JUL 26 From Osaka (KIX) to Shanghai (PVG) by JAL 891
July 30 From Shanghai (PVG) to Seoul (ICN) by OZ366
July 31 From Seoul (ICN) to Osaka (KIX) by OZ112