After I wrote it a friend (and priest, and quite a good preacher) told me that, although some other commentaries make my observations, in the Greek, the parallel structure is evidently quite clear, however and more in line with the traditional reading.