THe easiest way to avoid this is to always break your boat down rather than just leave it sitting somewhere. It takes very little time to break it back down to it's constituent materials. If carrying them is too much, make a chest on the shore and put them in there. Then when you come back you will always have your boat.