So if you primarily want birds I'd be going the 600L II, for closer stuff you can keep the 100-400 (maybe with 1.4xTC for wider than 600mm?).
You know Dr, I always heard that the 100-400mm push pull design is a dust magnet. I would bet if he goes for the 600mm that 100-400mm really will be a dust magnet, because it will be sitting on the shelf all the time collecting dust.