I'm still going to hold out for a 600mm f/4 L IS II. Its only $1200 more, for 2.25x more subject magnification.
A 7d and a 300/4 for even less is an option, kinda. I'm not a wildlife shooter, but if you're birding do you really need to zoom back to 200mm on a $11799 lens? It seems most wildlife shooters I see are toting a 600/4 and TCs combination. I've used my 200/2 on the odd bird if I'm out shooting kid pics, and I can tell you 200 is too short for any bird in the wild, works well for tame deer, but useless for timid tiny birds.