Just had my front windshield replaced yesterday at glass America with my BYO OEM glass. The installer who was very experienced recommended that I purchase the oem top mounding, as he said the decorative piece fits way better. We didn’t have it, so he used his aftermarket moulding, which he had to manually tape on. I have one wavy area, but it is barely noticeable. The oem side moldings can be reused, and we were able to reuse everything under the rear view mirror which includes the cameras and rain sensor.
So basically the next time source OEM glass and that top moulding and you should be good.
What kind of trim did they put along the top on yours? If they use the bubble molding that protrudes above the glass and roof level, it might whistle on the freeway, even though it is round and seems aerodynamic enough. Ask me how I know.
The stock stuff is all recessed below the planes of the windshield panel and roof.