Hi ,
Use Capture One Pro. We ran in to the same issues with our Nikon Z7 24-70mm lens. In Capture One you can set the lens profile to Generic rather than the lens pre-set. We’re now switching away from Adobe as there is no way, that we’re aware of, to turn off its Automatic Distortion Correction. You can grab a 30 day free trail of C1P. I should point out, we’re still testing this workflow to make sure it is sound so I suggest anyone who read this do the same before buying the software.
Hope this helps.