I feel quite a bit better about this whole thing. Thanks for the input everyone!
I rode last night and we even did some sitting trot. I usually warm him up for about 15 minutes and then I school him for about 30 minutes. He's also really clear about how he's feeling about something, so i'd like to think that were I doing something that made him uncomfortable, he would not so gently tell me to Get Off!!!