I would do the met-cons that Greg is posting with his CA WOD's. They are designed exactly for that purpose. I can't quite remember his quote but it was very funny in regards to why he has a met-con component to the CA WOD's. Basically just what you said, he was a little more direct though.
All the met-cons should take place in less than 15 minutes and have a great variety to compliment the O/Lifts. They might be a good addition. Today's was my favorite so far.
What we think, or what we know, or what we believe, is in the end, of little consequence. The only thing of consequence is what we do. -John Ruskin