You don't have to remove all the rock. Shrimp are nocturnal so they are out and about at night. Wait til after dark and use a blue led light and probably leave a net in the tank before you do all this so its use to seeing it then wait til there not paying attention and nab him.
You can even make your own with a 20-22 ounce soda bottle. Cut the top off at the shoulder of the bottle and invert it so the screw top part is inside the bottle. It makes a lobster trap of sorts where the shrimp goes in but can't find his way back out right away. I've used it to catch renegade damsel fish too.
Well, that's the hard way to do it but it gets the job done! Anyhow, now you can tweak those aquascape quirks that bothered you or maybe it was perfect and that pesky shrimp just made you destroy it.