It might stop eventually, let it sit a couple days and see how it goes.
I personally think two spots are awesome, I'd love to own one (never heard about them not living long, but never looked into them much either). As for the YCG the only thing I've heard is that they can be hard to get to eat. They sometimes "reset" themselves once moved and just stop eating and starve, but I think they're great fish anyway.
Now I'm not sure if they burrow but a prawn goby might be a good choice, they have a large fin on the back similar to the two spot.