I had a great holiday thanks, lots of sun and rest. Only then I had to come back and the weather is shocking!
Regarding your suggestion, I have started (well, last time I taught) to warm-up the class, dynamic stretch and save relaxed stretches until the last 15 mins, so spot on idea dude. I dont give my students isometric stretches because of it not being good for children and so forth. your routine is similar to mine although you seem to work harder at it. my suggestion is to have a good week stretching and measure up at weekends, what do you say? Did you read the thomas kurtz book? also how old is everyone, i'm 24.
Train hard and act as if you like it!