I've gotta say, after using the F-mount 35/1.8, 58/1.4, and 85/1.8, I really don't know that I'd sell any of those lenses for the Z-mount versions. Yes, the Z-mount lenses have quieter AF and are a bit sharper wide open, but you give up the manually-linked focusing ring and the way the lens renders specular highlights is interesting due to the optical design.
They're great lenses, but so too are the F-mount lenses which are plentiful and cheap, and work on my D500's to boot!