Definitely upgrade. But pay attention to the production per tile when you do. The Goat Farm is actually not very efficient. At the 5 minute production cycle, the Butcher provides 2.5 supplies/tile, while the Goat Farm for the same cycle produces 2.0 supplies/tile. The difference in efficiency will be in every production cycle, not just the 5 minute cycle.