Both worked today! I decided to combine things so that my basic plan of fitting certain things into each week will work, perhaps!
Chapiro and I walked down the track to the bottom field and the field shelter, where we stopped for a good ten minutes and worked on some neck massage into head down, walk on, back etc with the lead resting on his neck. He was pretty settled and I felt he was happy enough to stay with me. I did spoil it (doh) by asking him to go round the bottom track which takes him further away from home and he was getting quite stressy so we turned for home and got the calmness back. I will be interested to see how this improves.
Moo had a very chilled ridden session in the school, slightly sticky when we turned down the track afterwards but he walked happily on a long rein (even past the five nosey cows who were standing not a foot from the fence line) and only tried to jog a couple of times.
Good day all round.