Rounding up without broaching

I daysail a Catalina 25 in coastal California. When the wind is blowing 15 kts or more and I am going down wind on a broad reach and need to head back to port I am having a hard time rounding up into the wind without excessive healing and the feeling that I am going to broach. Any tips or suggestions? I try to take it slow and head off on a beam reach for a little bit before rounding all the way up but it still doesn't feel very controlled. Swell doesn't make the maneuver any easier either...

Rounding up without broaching