Improved light-cone sum rules for the electromagnetic form factors of the nucleon