Using 144hrs Transit Visa from Perth via Spore stopover to Shanghai (1-6Apr) to Taipei (6-11Apr)

Hi, I and my husband are Australian, just want to reconfirm that we can use 144hrs free Transit in Shanghai for our April'17 holiday, flying from Perth to Shanghai (via Spore stop over 1 night) to stay in Shanghai for 5 nights and then to Taipei (5 nights) then to HongKong/Macau (5nights) and back to Perth.
Thanks
Trish/Perth Western Australia