I would try glass cleaner first on the windshield, but if you are set on having it detailed professionally, that has the best bet of remedying your problems. You can probably request just glass detailing and headlight detailing.

The one time I had my Jazz detailed at Big Bert's it was PhP1900 for a full exterior job, and it so happened that the headlights were part of the deal. Not sure if the price has changed since that was about four years ago. Your price may vary