I agree. I think the meeting up for coffee is best and it's great that you put the ball in his court as to whether you will hash things out. Gives him something to act upon and perhaps show you his intentions. I think you are smart to put up the boundary of not letting him use your shoulder because it has always been there. He's just lucky that it has been in the first place.
I think actions do speak a lot more than words and perhaps your actions have been getting to him. Who knows, for sure. It will come out though at some point because it always does.
Enjoy your workout. I should bet my butt in gear, too!
