When I had my accident last October there were no aftermarket windshields made. Here in NJ if your car is still in warranty they can't use any after market parts that could void any part of your warranty. That does include the windshield.
Also AAMCO the windshield wiper people say to use only BonAmi cleanser on the outside of the windshield. It cleans it better than anything you have ever used. Just rinse it off good and dry it. You will even find that your wipers work better.

PS only BonAmi