Definitely go with shrimp. I've had dwarf crayfish enough times to know that they don't last long. They are bred for their colors, which results in weak genetics. They'll live for 6-8 months and then just die on you, nothing wrong with the water. Ask anyone who's had them.
Shrimp are so much easier, breed easily and you can have a lot more of them.