So, long story short, the sound was coming from the windshield wipers and the leak was coming from behind the taillight. They replaced both and it fixed the issues.
As a side note, I had two loaner vehicles during this process and they made me miss my car so much. The 2017 model X 75d and 2016...