In my opinion, Get back to basics and get a good recall , Using whatever method you need to , i.e. food,toy, treat or a squeaker , whatever flicks the switch on your dog. Get this solid as a rock and the work you put into that will reap loads of reward. Then long line them amongst stock . My experience is the carrot works better than the stick , and punishment can come in the form of just a firm voice. If your too heavy on the hand why would they want to come back to you . How many times have you seen a handler loosing the plot with the dog crawling up its own arze knowing what comes next