Guilin

We only spent an afternoon in Guilin (City of about half a million; closest train station to Yangshuo), but I thought it was beautiful. It's right on the Li River, and in the main square is a a park including Elephant Mountain which, if you're willing to climb up some really steep steps, provides a great panoramic view of the area.