Thanks for all your advice^

Hoping Hongqiao customs doesn't take too long since there are so few international flights compared to PVG.
Sounds like I'll withdraw some cash from the ATMs on arrival and then take a taxi to the station if the lines are not too bad, with the metro as a backup. If I book my tickets in advance I could then simply pick them up at the station right? Would be willing to pay the agency fee if it saves the hassle of waiting in long lines and not being able to board the next train.