Another interesting discussion of Joss Whedon's work, with great comments, can be found here.
While I am a huge Joss fan, I don't think everything he does is perfect. However, he's making a serious effort to take diversity seriously and if he sometimes falls a bit short, at least he's trying. So few in Hollywood even try.