Very good point! The truth usually lies somewhere in between! Yes, you are right that for a very ionic bond (like NaF) the last Na electron is really mostly on the F.
Note, however, that the approximation that the structure factor is exactly proportional to Z is only rough anyway -- as there are form factors etc to worry about. So worrying about a +1 or -1 here and there probably is not so crucial.