that annoying whistle is from the fins at the base of the windshield, see if yours is loose, my dealer ordered new clips as the whole plastic plate shifts around
I have the noise also it is from the fins at the bottom of the windshield, I asked my deal er about and they ordered new clips as they are all loose on mine.
I took mine in and had them go full synthetic and the dealer changed the computer to extend the oil change reminder to 5000 miles, they asked me which I prefered 5k or 6k