Yeah I am with Nihonjin....not so sure that it is a pistol, especially with the updated pics. Though thats what it most closely resembles to me. Whats throwing me is the way the joint between the cephalothorax and telson pinches in like a wasps does....not something I have seen in pistols before. Then again, there are a lot of pistol shrimp and their allies so it could just be an odd one. The claws also dont look like pistol shrimp as you can see from NAs pic.
I think we can rule out mantis shrimp. Mantis have highly stalked eyes the extend high above their (much shorter) rostrum and their legs look different as well. Watching it move would be diagnostic though....mantis use their swimmerets to "float" along, only lightly touching down with their legs. Pistols and their allies creep along, walking with their longer legs. Also notice the claws....mantis keep their appendages folded up underneath (like a praying mantis insect does), only extending them very briefly (hundreths of a second) to feed. So, I am going with as yet unidentified, possibly not reefsafe shrimp of some kind. Maybe try one of the expert forums for a positive ID. Dr Ron is really good at these sorts of things. Keep us updated if you do find out a positive ID.