Yes to guide for both days, no to clothes. Too short a time for quality workmanship.
Did Shanghai on our own for three nights so had plenty of time. I see a reference to Bund area, no mention of Pearl Tower or a short river cruise, can be done at night. cabs maybe difficult at night after the cruise, tough if it rains !