And and and...
"Par agli baar shayad hum na ho" with that echo, was a huge hint.
Foreshadowing!
Shubh will make a re entry in Kavya's life. They might even get back together. And this will lead to misunderstandings between AdYa cause in the IF article, Mishkat said, "Sumbul and I share a fantastic off-screen connection, so it's challenging to summon hatred on screen." and this is only possible in the face of misunderstanding, I guess.
My only concern is that I want AdYa to be the end game and both of them to reciprocate the love, admiration, fondness, concern, care, respect and trust.