Recommendation for Komodo Day Trip from Labuan Bajo

Hi, I'm going for a short trip to Labuan Bajo and am looking for a day tour to see the Komodo dragons and some hiking.

So far, the day trips that I've seen go to Komodo National Park and a few snorkeling spots as well.

If I'm going with a non-swimmer, which day trip company would you recommend that the non-swimmer will feel safer in water?

In my travels to other Asian countries, some of the staff from snorkeling day trips will jump into the waters and guide the non-swimmers (eg by pulling them along using a tire).

Or are there day trips that go to Komodo National Park but focused more on trails?

I supposed the last resort would be for the non-swimmer to stay on the boat when it stops at the snorkeling spots.