From your discription I would agree with the Pistol Shrimp but also check Mantis Shrimp just in case they are similar in appearance but while a Pistol is fine for a reef tank you dont want a Mantis in a reef. Also know that both will make a loud clicking noise almost like snapping your fingers sounds. This is normal.