I put electrical tape on the bottom right windshield edge and noticed the whistle decreased, but still present. I pulled over, ran another piece to cover the entire bottom edge, and lo and behold, no more whistle!!
I’m drinking a beer at a local tavern right now in your honor.
I pulled off the tape and will look for some automotive piping to cover the lower lip. I’d prefer a more finished look than black electrical tape.