+1 on the battery comment, although I feel pretty safe going beyond 50% life. It is pretty nerve wracking when you have "canceled" the "go home" option due to critical battery low and then realize your drone will start to land itself no matter what. Barely made it to shore!
Something that works for me and I always tell anyone else flying my drone. NEVER look at the drone. When I am on water, I fly 100% fpv. As soon as you take your eyes away from the fpv, you completely lose your sense of the drones direction.
I never practiced a "catch landing" on land. But I would also recommend that. I have landed on the sun deck, but much prefer to just hover between the tower and swim platform and just have someone grab it. Tell the person who is catching it when you are in position, otherwise they just want to stare at it and tend to try grab it before you are in position.
If you do lose your directional awareness of the drone. Make sure the driver knows that they may need to drop the rider before getting too far away from the drone.
When I am following a rider, find an altitude that you like and don't touch the "up/down" of that joystick. Mainly concentrate on your forward/back direction and yawe.