So after going in with wind noise complaints twice and having two different technicians tell me they dont think its excessive I asked them nicely to still have a look for my peace of mind. Turns out they have found an issue with the windshield, it's not sitting flush with the glass roof and is causing uneven airflow resulting in the noise I'm hearing. They'll be removing and reinstalling the windshield to fix the issue. Fingers crossed it goes well and doesn't cause any other issues.