I suppose Hangzhou is also worthy of consideration. The Shangri-La on the lake isn't expensive, and I find the beds to be super comfortable. For the lake tour drill, I suggest hiring a private boat that is small enough to go under the bridge to the less common west part of West Lake. And, tea harvest is right around the corner. As you might know, the first crop 皇帝茶 is the most prized. All this being said, rainy season is also upon us so I suggest you only do Hangzhou if your dates are flexible. I could probably handle Wonderland in the rain because I'd be swimming anyway.