As far as the waterline goes, I can't imagine the difference for your boat in salt vs fresh water would be more than a half inch or so. If the boat is going to live in salt water in the summer, I'd say mark waterline in fresh water, that way when it's in salt, your bottom paint is a little higher than the true saltwater waterline, and you won't get scum on your hullsides from wave lap!