I have lost 2 diamond gobies now due to carpet surfing

They seem to shoot right through the eggcrate I have on top of the tank. As much as I love these guys I'm not going to buy another one. What else will do a good job of cleaning the top layer of sand? I was thinking of a dragon goby but do they spit sand everywhere? I don't want to have sand all over my corals and clam. Any recommendations would be great.
Thanks