That's great Peter. Sounds like you are putting in the effort, good work
When Franky (sikung's brother)came over here the first time, he got us to spin for an hour before training anything else. That style of training lasted a month and we trained 3/4 times a week. There is something in high reps that seem to help awareness and relax the shoulders, they get too sore to hold on to