I was there last September, and I'd recommend the longest zoom you can get (300mm should be a minimum), and without a doubt, rent a 10-22. You'll be walking along boardwalks and standing literally 3 feet from open thermals, "pots" and geysers that have so much visual interest you'll feel like there is no way to frame it without sacrifice, so go wide. I'd also leave the macro lens at home, instead bring a tripod and a polarizer for the 10-22.
I would echo this also. When you can't back up, nothing beats a wide angle.
I will add that I was much happier with the images that I took with the 16-35 II vs the Tokina 11-16. Not to say that the Tokina is a bad lens, but the perspectives are different. The 16-35 was on my 7D for much more time than the 11-16.
The 70-200 was nice for some instances.
Automated stitching using photoshop and handheld images taken with the 16-35 worked very well for me at the Grand Canyon. The stitched image looks better than what I took with the Tokina. Unfortunately, I did the shots intended for the panorama on a whim because it has never worked out for me in the past. I regret not taking more.
Don't forget the stitching option. It will work well if you are far enough away and have enough overlap.
On the 7D, the 16-25 II is by far my favorite.
