Are there boat trips also from Yangshuo to Guilin available?

Hi.
First we have planed to go from Fenguang to Guilin one day, then go by boat trip to Yangshuo, spend rest of the day in Yangshuo and another day go back to Guilin and fly to Shanghai.

Now I have realised, that we would save one way if we traveled from Fenghuang directly to Yangshuo and there take boat trip to Guilin. But I havent found this direction: boat Yangshuo to GUilin. Is that possible way?

How to solve it when we want to spen one day in Yangshuo and then return to Guilin?

thank you

Lukas