Thanks Parrotfish and moondog for the comments. I did end up making a reservation at the Marriott Executive Apartments at Tomorrow Square. Sounds like it's a great property and I'm still amazed at the deal I was able to get. Will write in a mini-trip report after my stay.

Now that my accomodations are set, do you have any dining suggestions? Keep in mind we've been to Shanghai numerous times, though the last visit was about 3 years ago. So far, we have only booked Jean Georges at 3 on the Bund.