I think you have the Jesus thing figured out pretty well.  EFC makes two errors, commonly associated with fundamentalists, in his/her attempt to use Luke 22:36 to suggest that Jesus approved of violence:  First: s/he fails to account for the context of the passage -- Jesus’ exasperation with his apostles’ continuing failure to understand his mission.  Second: s/he tries to lift one passage from one Gospel and set it against the witness of the rest of the New Testament and of the early church.  This is sometimes referred to as “proof-texting”; it’s not a catholic (small c intended) approach to scripture.