If I am travelling from Toronto to Tokyo for 16 days with a 37 hour stopover in Shanghai in each direction, can I use this visa-free option in both directions?

Yes there´s no time limit and you can use the twov as much as you want.