With https://www.openstreetmap.org/changeset/130667240, this intersection is now in pretty good shape.  There are probably some minor errors left or details that could be added, but that's typical for OSM and I don't think it justifies keeping this note open.