Tokyo -) Shanghai -) Macau -) Shanghai -) NYC

First part is eligible for the 144h twov, return part is fine for the 24h twov (if your 2nd stay in Shanghai is over 24 hours, then you're covered by the 144h twov).

But your passport must be eligible to use the 144h twov.

Thank you. The return part through shanghai I will only be there less than 3 hours. Assume that is okay?

Yes, it definitely is, but this segment of your itinerary will be covered by 24 hour visa free transit because your entire transit time in mainland China will be less than 24 hours. In any case, your entire itinerary is constructed to secure you a visa free travel.