I'm more focused on being in generally good shape now than just strength or size. I'd like to stick with my weight lifting routine, add HIIT cardio and punching bag work, and even yoga if it won't interfere with recovery. My current program is:

Monday - Legs/Traps
Tuesday - HIIT
Wednesday - Back/Triceps/Abs
Thursday - HIIT
Friday - Chest/Biceps/Lateral Delts/Forearms
Saturday - HIIT

Any ideas on how to incorporate all the elements without hampering recovery?