I think I got the mess untangled.  I offset each deck ~5ft from the centerline (which was closer than they've been drawn in the past) to make things clearer and easier to edit since osm software doesn't deal well with things that exactly overlap.