My gym does 15 minutes of running at the very beginning, then we stretch. If it is a meet weekend we go straight to events, then the last 30 minutes is spent doing conditioning/flexibility. It is usually modified and a bit easier, but we normally do 30 jelly bellys (1 is tuck up, pike up, straddle up), 2 sets of 30 pushups, 50 situps, crunches and obliques to each side. And 15 minutes of hard cardio, then oversplits and other flexibility such as kneeling arches and skin the cats. On states and regionals week we do no conditioning and 15 minutes of flexibility. On normal weeks, we start with 20 minutes of running. We then do 30 minutes of conditioning-not too hard. We then go to events. Then for the last 45 minutes we do conditioning/cardio/flexibility. This is intense, usually 20 minutes in we have at least three girls crying, but we believe in hard conditioning. If you are injured, you get a modified workout. Your conditioning does not sound to bad (it is now, but it will get easier)