I went with the 70-200 2.8 II and if I need more I will get a 2x converter. I've got the 7D now and will not be focusing on birds, mainly outdoor / nature / mountains / rivers / fishermen / fish etc. I'll see how it works for me.
I also wanted the 2.8 for low light. I love shooting late and night shots.
Some of the shots with the 100-400 are just excellent. It was a tough choice and I'm not sure I made the right one.
You made the right decision IMHO. The 100-400 lenses come up often with sale prices at or below $1,200 and I've watched a bunch of newer ones lately sell for about $1,100. Easier to save up $1,100 than 2 grand.
I didn't look at the gear list, but if ou like shooting a lot of nature, you may want to go with a wide prime next. You'll get those great mountain and river shots.