So, to sum it up, when flying into a headwind there are 3 changes the pilot should make. They are, in order:
1) sport mode!
2) change altitude to see if you can find calmer air
3) "tack" left and right instead of flying straight into the wind if you can't find calmer air
4) realize tacking will...