Pistol shrimp snapping at everything, Including Fish!

I recently put a pistol shrimp in my tank along with a yellow watchmans goby. Within an hour, I noticed the YWG was not anywhere to be found and the pistol shrimp was by himself in his burrow that he had just made. I watched the tank for about 30 minutes looking for the watchman until i found him in the corner of my tank lying there with a tear in the top of his dorsal fin. He was completely lethargic and unhealthy looking so I began to panic and point the finger at the pistol shrimp.



Now until recently, anything, And I mean anything that swims by the pistol shrimps home will be snapped at, including snails, hermits, and my YWG. After the YWG healed, he attempted to reunite with my pistol shrimp, but he would stay at a safe distance at least 4 inches away. When he attempted to get any closer, the pistol shrimp would snap causing him to retreat. They now stay on opposite sides of the tank and the pistol shrimp now lives by himself. Is this okay? Can the pistol shrimp survive without his goby friend?



What are your opinions of this? And what would you do in this situation?