Helene, it sounds like you are on the right track - yayyyyy! It is about doing what our bodies are ready for, it sounds like you've some good advice.

Last night I hit my usual KB training group. He kicked our butts with a non-competition based conditioning workout that featured KB deadlifts/swings/snatch/pushups/rows. A 25 minute long competition Long Cycle would have been easier, but it was a great workout. He is pulling us back a bit so we don't over-do things before our competition in 2 weeks.