Maybe not what you're going for, but you could try some of the CrossFit stuff that doesn't involve Olympic weight-lifting. Check out
www.crossfit.com and go to their exercises page. It's more the philosophy of doing-things-hard-core-to-be-prepared-for-anything that you might find more useful than any of the exercises.
For instance, you mentioned push-ups, but can you do hand-stand push-ups? (Or a handstand?) Also, you mentioned pull- and chin-ups, but can you do them while doing an 'L-hold'? (That's holding your legs out directly in front of you to make a right angle out of your body.) There are a lot more variations on the standards you've already mentioned. Plus, you don't have to fit a class in your schedule to do this stuff, though I highly recommend getting into yoga as soon as you can as well.