Geneva hands down. Language skills are absolutely necessary in the field post-graduation. Crash through some intro/grammar courses before you go and you can pick up the rest when you get there.
I'm in the same field and the Graduate Institute would have been my first choice because of the language opportunities and connections to all the organizations in Geneva (I didn't end up applying for relationship reasons). I wouldn't pass up the chance to study there if I were in your position.