Wrasses and crustaceans do not mix as a rule, same goes for snails sometimes. I would be very cautious adding any goby with a wrasse. Sometimes it works out but it really depends on the wrasse. By the sounds of it, yours is very aggressive.
Is this for the 36 gal