Tanks looks good to me, sounds like you are on the right track. When your rock is cured I would just spread it out more, make some crevices, caves etc...just some hiding spots for your fish, and shrimp love to move in and out of them as well. When I opened up my rock more it gave my snails more access to clean all the rock
Just my 2 cents.
