But have you considered that the speed for best glide angle is higher than
the speed for best L/D in a headwind
Unless you have the aircraft polar in front of you, a good rule of thumb is add half the head wind component onto the speed for best L/D to get maximum penetration.