I think the writers of this version are making Raavi's transition very complicated. Looks like they want to drag it as much as they want to give us nok-jhok scenes between Shivi. Raavi needs to have one final introspection, come out of abla naari mode and move on. She is a young girl, has a great family support. Shiva is always there to care for her despite the insults which she is immune to by now.
I always felt that Raavi's character in the original, as well as this one, never truly loved Dev. It was more of infatuation and Dev has always projected in front of her as the good guy where as Shiva is an open book. I was always told growing up that it is better trust a guy who is like an open book than one who tries to be goody shoes.
I am hoping to see a change in Raavi in next week's episodes.