Once you kill General Tatarin, do not bother taking land back to your boat. Just jump into the water and swim there.