You have summed up the whole episode nicely.
I really like the point which you analysed about their first meeting, be it in a Temple for the first time and now in Dargah for the first time after 3 months lapse. :) This symbolises Shivika's pure love for each other.