Just returned from a three week trip to China and HKG.

For a now, I vote for Shanghai.
Look for a river view hotel where you are on the opposite of the Oriental Pearl Tower. We were at the Renaissance Marriott, the view of the neon lighted buildings across the river was one of the best. They even had a bathtub in the " sitting room" where you could soak and take in the view.

Take a duskc time river cruise ( see daylight and night lights. ).

Plenty of cheaper shopping too.