Did the shop send you to the dealer for the calibration or did they do it themselves? Whoever did the calibration I would think they would have been the ones to discover that it wasn't working, not you. Could be that this is actually a calibration problem. OTOH waiting for the OEM windshield might be the better solution if it doesn't cost you anything and since you get a free loaner car.
If you have a chance to "visit" your car can you please look on the windshield for the manufacturing information, sometimes it's a little hard to read but please let us know everything it says, even better you can take a picture of the manufacture information.