I will not do another overnight. One important thing to think about. The airline might not let you check thru your luggage with an overnight stay. We tried that on UA at ORD after flying in from PVG. Had to take the bags to the Hilton and check in the following morning. The baby slept enough on the plane to be wide awake while we were trying to sleep in the hotel.

This time we are doing PVG-BUF with only a 3.5 hour layover. Get there as fast as possible is my advice.