Ralf's approach is better, if I would start rebuild my map I would choose to do the same, but it will take too much time to rebuilt my map from scratch.

@Gerd, I see now that setting  junction=roundabout {set access=no} after the roundabout rules doesn't work at all, do you have any explanation why?