There are some species of goby will pair up with pistol shrimp,
like Amblyeleotris, Cryptocentrus, Ctenogobiops, Lotilia, Stonogobiops.
But if my memory serves me right, the Diaomond Orangespot Goby is
belonging to Valenciennea family, and never heard of any Valenciennea will
pair up with any pistol shrimp.