After our couple giraffe-esk rides, I put Buddy back in the German martingale. It helped so much!! He didn't even protest that much other than being a little behind my leg in our upward transitions.
Yesterday we did a little longer ride, working on some of the movements in our tests. We worked on our trot lengthenings, and had a bit of breakthrough. I usually post during the lengthenings and Bud usually just speeds up. I tried sitting yesterday while keeping my hands up and set. It seemed to work; I could feel him start to lengthen his stride without rushing. I tried again today, and while it wasn't as good, it was still an improvement over before.
We did a little shorter ride today, as he was more compliant and moving off my leg better. We schooled more transitions today and after our work we wandered out to the field and popped over a couple jumps. We have one more ride tomorrow before showing on Saturday.