Redesigning the two intersections more fundamentally is needed. It is a challenge given the current curb cuts and buildings so close to the road. Ideally, we'd fit roundabouts (or a peanut roundabout) to reduce conflicting turns, smooth & slow traffic flow, and eliminate the signal confusion.