That second picture of yours is just a normal roundabout. Try making one of the roads pass directly through it. And don't change the signaling.
I've noticed that the tram line cuts the traffic in 3 points. What is the speed of that street? Anyway, the tram line is clearly signed in a way that can be noticed on the photo. And every car there is making a weird curve, nobody is speeding anyway.