I would try the yellow watchman goby first, and give it a little time to see what happens. If they dont pair up, you can always add another pistol shrimp later to pair with the goby, but no reason to spend money on a pistol shrimp if you already have one that may do what you want.