For Andaz, don't use the DSU as the XL room is bigger than the suite.
I'd highly recommend Hyatt on the Bund. While after PH the room/suite will feel a bit cheap, the suite is in the rounded corner and has a unique view on the Pudong Skyline, visible from your bed. Fabulous.