One way you could have improved your trip, especially since you stayed overnight in Shanghai:
Fly GMP-SHA, then PVG-SIN. Much better and easier experiences departing GMP and arriving SHA.
Fares are the same - I bought and flew a ticket earlier this month GMP-SHA//PVG-CGK.