Your LFS was wrong about the cleaning habits of a the watchman (and cause for concern for taking their advice from now on... not that they are dishonest but that they may be lacking in knowledge) as they rarely venture more than a few inches from their claimed territory. The orange-spot diamond is an excellent sifter to the point that its diet will have to be supplemented with hardy frozen food such as blood worms and mysis or/also quality pellets. What type of watchman is it? If it's a small species (yellow, high-fin, randalli, etc.), then I would get a larger orange-spot and not worry about aggression. But if it's a larger species like the pink spot then there is still a decent chance of having both but I say it with less confidence because of the tank size. Either way, they are both jumpers so please have a secure top and qt any future gobies (especially sifters) as they tend to either do great forever or waste away due to internal parasites which they are very prone to carry.
Good Luck!
Mike