I totally agree with all of your comments. Oscar is not the most confident dog and that would help him. I’m going to redo parts again and incorporate your suggestions.
He has a wonderful stay in training, not so much at trials. The pressure bothers him in that setting. I try to push things in training hoping he can cope better at trials.