hopefully you can get an OEM windshield replacement... not sure if they are hard to come by or if there are "generic" replacments available yet. When I had to replace the windshield on my Lexus, the insurance wouldn't pay for an OEM replacement ($1400!) when a cheaper generic ($700) was available. I ended up getting the generic and it felt like it didn't have as much sound insulation built into it, definitely heard more wind noise with the newer glass.
One (rare?) instance where OEM is definitely better than aftermarket...