Go to Happy Valley on the first day (if you live near Nanjing Road), take subway 1 line to Xujiahui Station, and transfer to Line 9 to Sheshan Station. There is a direct bus ferry to Happy Valley.
You can go to Madame Tussauds Wax Museum or Huaihai Road the next day. . . There is a scallion cake near Huaihai Middle Road. . And dessert full of memories. Not bad. .