Conditioning in and outside of regular cles?

It sounds like you're pretty much doing what you should be doing, but I would add more cardio outside of cl, e.g. running, swimming, jope rumping, cycling. I like to do rope jumping in between my strength training, e.g. jump rope for 5 minutes, do push-ups, squats, leg raises, and then jump rope again, etc. Also, you must try to include stretching into your routine, at least every second day.