I would just use soft word wrap - well, I always have soft wrap on, but especially in this case it seems simplest to me to let long sentences/clauses soft wrap and retain the mapping from line to semantic unit.