I think that's a good approach - definitely an ancestor, close-kin, but a true "whale" begins when the creature becomes fully marine. Otherwise you'll really be going against the grain of, what, four thousand years of human vernacular? (in whatever language applies)