If the goat/sheep dairy agrees with you then I would keep it in. Maybe just try cutting out gluten containing grains/items for few weeks and then do a challenge. Here is a list of stuff with gluten:
http://www.csaceliacs.org/gluten_grains.php

I hope you feel beter soon,
Jen