It seems that swapping out n-way stops for circles is almost always better, unless they have signals on them IMO. Or unless you have the circle turduckien one Swindon.