Have a nice trip and enjoy.
Looks like you have a generous amount of time to spend, that would make it possible to see and digest a lot of adventures. Wish it was me that had that much time available to spend on a trip
I’m sure it will be an experience for a life time. My advice, (ok I know you did not ask for it, but you get it anyway), is to read up on things so you have your options/alternatives ready. On the other hand do not make too many specific plans. After you have stayed a few days in china, you will probably be surprised on how easy it is to travel there. You will also meet other people there that share their experience with you.
Yangshou was on of the first places I visited first time I went to China. I have found memories of the place. I would recommend the “Impression Sanjie Liu Show”. First i thought i was not for me, but I was strongly recommended to go and see it by another tourist. It was great and different from anything I have every seen. Other thing you might consider is the “Longsheng Rice Terraces” it is a couple of hours drive from Yangshou, I never got there, but I wish I did.
Imho, two weeks in Yangshou seems a too much, 1 week would give you enough time. If possible keep your plans open, so you are free to travel when you are happy.
http://www.visitguilin.org/index.php/en/sightseeing/attractions-a-activitiesWhile I’m at it, thumbs up for LiJiang. It has a little bit of “Disney” feel about it, but well worth a visit. You can also visit Qiaotu, which is close by. It is the same style as LiJiang, but not as crowded. If you like nature scenery, Tiger Leaping Gorge is a just few hours from LiJiang/Qiaotu.
As you know is so much to see, I’m sure you will have great fun.
..ok I need to stop new, getting too enthusiastic ...