Yeah I just rewatched recently too and the sexism seems unnecessary. Just being a know-it-all or even just fighting his own twisted sense of warrior masculinity is enough of a start point for his arc.

The space sword episode being his redemption, one of my favorite episodes