I guess the only silver lining for Shiva from audience pov is that he doesn't know about Rishita's change of heart. Even so, this was taking it a step too far. My heart went out to poor Krish, lmao the kid is so shaken up with this whole prank.
I wish they would've shown Shiva hearing about Raavi's insult, it would've made more sense then. Remember how all of us were rooting for Krish and Shiva to take the bhooth game up a notch after that episode? We don't want it to continue now because we've seen things mellow down, would've been a bit justifiable if they gave Shiva the same reason.
It's obvious that he's going to get rightfully assaulted from all sides, I wonder if this is a setup for an emotional outburst if not a full-blown breakdown. He'd already be in low spirits from getting scolded by Gaura and falling out with his brothers and Raavi - Mami's entry will add to his problems and might catalyse a strong reaction.