We're going on a multi-city China tour in June, and Guilin/Yangshuo will be one of our stops. I'm trying to draft an itinerary for Guilin/Yangshuo, and I have come up with 2 different itineraries so far. I haven't decided on the hotels yet.

First Itinerary:

Wednesday, June 4 - Guilin

-Arrive Guilin around noon. Take taxi to hotel.

-Seven Star Park

-Night Market/Shopping Street

Thursday, June 5 – Guilin/Yangshuo

-Li River Cruise in morning

-Arrive in Yangshuo

-Check in to Yangshuo hotel

-Night: Liu Sanjie Light Show

Friday, June 6 – Yangshuo/Guilin

-Rent bicycles, ride through Yangshuo countryside

-Check out of Yangshuo hotel

-Take taxi back to Guilin

-Check in to hotel in Guilin

-Reed Flute Cave

-Solitary Beauty Peak or Fubo Hill

Saturday, June 7 – Guilin/Beijing

-Taxi to Guilin airport. Board flight to Beijing (haven't decided flight time)

Second Itinerary:

Wednesday, June 4 - Guilin

-Arrive Guilin around noon. Take taxi to hotel.

-Seven Star Park

-Night Market/Shopping Street

Thursday, June 5 - Guilin

-Reed Flute Cave

-Solitary Beauty Peak or Fubo Hill

Friday, June 6 - Guilin/Yangshuo

-Li River Cruise in morning

-Arrive in Yangshuo

-Check in to Yangshuo hotel

-Night: Liu Sanjie Light Show

Saturday, June 7 - Yangshuo

-Rent bicycles, ride through Yangshuo countryside (could do this June 6 afternoon I guess)

-Check out of Yangshuo hotel

-Take taxi from Yangshuo to Guilin airport, board flight to Beijing (haven't decided flight time)

Which itinerary is better and more convenient? Would you shift some activities around? Is there time to do some other things? Is it easy and reliable to get transportation from Yangshuo directly to the Guilin airport?

Thanks for your help. Planning is fun :).