After reading everyone's comments, I have got some positive thoughts and this is my take on Shiv.
I think Shiv is fighting 2 battles at the same time;
1) To make sure that it is worth fighting against J, and that A will stand by him (shiv)
2) Making sure that with all these experiences, A comes out strong enough not to be emotionally shaken by J's cheap tactics.
I think Shiv is intelligent enough to understand J's slyness, therefore he first clarified with Anandi on what she thinks of her future and does she want to go back to her past? This is so that he knows whether it is worth fighting against J or not?
After A's assurance, Shiv has moved to his next responsibility which is to protect his fianc and their relationship. Shiv letting J in his office, allowing comp access, behaving nicely etc is probably to fool J. He does not want to pick up a direct fight with J and appear biased or non-professional in front of villagers, Anandi or Singhs. Therefore he is being calm, composed & professional, giving enough liberty to J and then let J fall in his trap. I am assuming there is some plan behind all this.
Time will also come when Shiv will tell J, that Anandi is his (S's) fianc with all his rights and confidence, but it is not time yet. He first needs to see a composed Anandi who can shrug Jagya off instead of getting disturbed with his presence.
In this way, Shiv would have protected his career, his fianc and also shown Jagdish his place. Not to mention building a strong bond for his relationship.
This is how I am hoping story would develop. I cannot bear to see Shiv making a fool out of himself and Jagya getting a victory over him.
Please share your thoughts