I think the current track is mainly about Raghav's change and developing his relationship with Chakor and Anjor.
 
On balance of probability Raghav isn't Suraj but they've left the door open for him being Suraj, the way he protected Chakor, the way Chakor compared his behavior to old Suraj.
I think they should've had a few months leap and showed Suraj with memory loss. Makers think suspense will keep viewers interested but it may drive them away, viewers are protective of their favorite jodis. 
They should've learnt from Shakti, they didn't go for reincarnation nor did they kill the ML and brought his look alike, they preserved the jodi and went for double memory loss.