I would go to Guilin first. Schedule a boat trip for the next day down the Li River. That night take a night trip by boat around Guilin. There are many colored lights along the river it is very beautiful.

The next day, when cruising down the Li River look at the back of a 5 RMB bill.
I would stay the night at Yangshou. Tell the tour operator you want to get off at West st. That's where the hotels and shops are Bargain hard.
The next day a short walk to the bus station and you can go back to Guilin.
Note: no taxis in Yangshou when I was there a few years ago