Suggested Length of Stay in Guilin / Yangshuo

I want to visit the major sights of Guilin and Yangshuo. In Guilin, I want to see the Longji Rice Terraces, the Reed Flute Caves, The Sun and Moon Pagodas and the Elephant Trunk Hill. I then want to take a river cruise to Yangshou. Yangshuo would mainly be for the river cruise but also for the atmosphere of the Karst landscape outside of Guilin.
How many nights in each city are recommended? I was thinking 2 nights in Guilin / 1 night in Yangshuo.
PS; we move at quite a quick pace on holiday so we can fit a lot in each day!

Thanks, Jack