I resurveyed this today and came up with https://www.openstreetmap.org/changeset/134883707 and https://www.openstreetmap.org/changeset/134883774. A bit of a mess but that's everything that terminates at this intersection, it seems, so I'm calling it good enough. Would love feedback though.