No, the first one is correct, except you should use the native resolution when changing the aspect ratio. It won't make a difference in this case, but that's the point of the selection. Changing FOV in CSGO affects the sensitivity, and will not give you the correct value unless you actually change it in the game.