Increased energy, concentration, and muscle mass/tone would be additional goals.
Option 1 is 30 minute circuit training workouts, utilizing compound exercises with dumbbells, 3x/week. (i.e. Core Performance Essentials)
This gets my vote, that sounds very good.
Would the physical results from each option be pretty much the same?
I think the physical results would be more pronounced with option 1. However, one of your goals is concentration, and I can't see circuit training being particularly effective in that area. I hate to ask, but, could you in any way blend these two options? I assume the yoga/calisthenics are a class... is it not at your gym? In other words, what prevents you from lifting after the yoga/calisthenics? (it may be time, location, or whatever)