The best way to guarantee the right windscreen is to have one ordered through the dealer. Even then, calibrating the Eye-Sight comes down to the replacement method. They need to replace any gel pads or adhesives used between the cameras and any other sensors the system uses. Fingers crossed they don't hit or knock the cameras when removing & refitting. The number of cars we see for a windscreen recalibration with poor workmanship or cameras requiring re-aiming ($45k of equipment needs to be ordered in) is horrific unfortunately...
Could an option be you add windscreen cover to your policy now and hold out on the claim until the next WOF?
For my 2c, I had a rear windscreen replaced by Smith & Smith (forget the branch) they used second hand glass, snapped the aerial wires off left hanging and left a lot of glass in the car. They refused to ever use second hand glass, and said they were not qualified or equipped to remove all the glass from within the boot... Their tune changed I had my insurance company involved...