More of a theoretical answer as I haven't tried it. But I would put in the yellow watchman with a pistol shrimp first, so they can dig out a whole and get comfy in the tank...After they are settled in, then I'd add the diamond goby. That way, if the diamond does get close, the watchman would have a whole to dart into
Again take this with a grain of salt as I haven't tried it