Hi and welcome! Thanks for your contribution! Yes, your tagging is correct. I'd only add "junction=roundabout" to the circle road, and also it's better to join small road chunks to be one way (two oneway roads connected to the roundabout)

ping me if you need help with fixing them