Think about destroying your boat and putting the materials in a chest onshore. It only takes a minute to grab the mats, pop up a bench and build the boat. Might save some headaches.