If you are looking at MKII lenses I would echo the earlier suggestion to wait for real world reports on the 200-400. I certainly think if it has prime sharpness, comes in under 10K (one can hope), and focuses fast, it could be a big winner. Also, since the 600 MKII will be the same weight as the 500 mkI, if you are going to go for 500 might as well go for 600. You could always get the 300 F4 IS no matter what as a handholdable backup/ready camera if something comes at you close while the tripod is locked down in mirror lockup waiting for the subject in the distance.
I use my 500 on the tripod and 400 5.6 around my shoulder in that way with quite a bit of success. Many times with nature, birds particularly, it is easier to just swing up the lighter lens for a quick shot then loosen your tripod, get re-situated, and start shooting again.
The 7D wouldn't be bad, I have a 7D and 1DMKIII, just got the 7D a month or so ago, but it is a capable camera. Focusing isn't quite as quick as my 1-series, but certainly adequate.