I have deduced a possible arrangement of the roundabout in https://www.openstreetmap.org/changeset/182749069 ; please see if it works.

If it works, then the next step is to reroute the bus relations to use the roundabout and close this note. The old T-shape junction is kept because older imagery still describes them as such, to prevent accidental remapping.