On the Yellowstone/Glacier debate: Do you enjoy hiking or just pavement viewing? If you enjoy hiking then adding a day makes sense.
Oh course, not sure about schedule, but seems like you shouldn't get home until 8/2, but planning arriving 8/1 makes sense giving a day to relax and safety.
I've been to Yellowstone twice, both times for five nights. Both times I was sorry I had to leave as a couple more days would have been nice.
Other than that looks a bit ambitious but definitely doable/enjoyable/memorable.