144 hr visa free transit and 24 hr transit

Travelling from Manchester via Zurich to Shanghai Pudong Intl. Airport arriving 27 December, staying 2 nights in Shanghai before a 4 night cruise from Shanghai (Boashan) cruise terminal stopping for 12 hours in Kumamoto Japan and back to Shanghai ( Boashan) cruise terminal on 2 January, to transfer to Shanghai Pudong Intl. Airport for flight back to Manchester via Frankfurt. WIll the 144 free transit work on the way out and will I be able to use the 24 hr free transit on the way back.