Also, not all pistol shrimp pair with shrimp gobies.
The name "orange spotted" is used for two goby species that are very different in appearance and behavior: a shrimp goby (Amblyeleotris guttata) and a "sleeper" or sand-sifting goby (Valenciennea puellaris). You need to make sure to get Amblyleotris guttata as sleeper gobies don't pair with anything.
Most gobies (there are over 2000 species in the family) are not shrimp gobies; but here is a good list of those that are:
http://www.wetwebmedia.com/shrimpgobies.htm