I think you can maybe make the raft work alright by adding walls on either side of the land beside the dock, meaning there's no way to walk into the water (i.e. pretty much what you said, except we're funneling the player before the dock as opposed to at the dock.
Also, if you're not using 4-way movement, the 4-way ladder is sadly rather glitchy.