That's a tough call. FWIW, I prefer the 800PF if I'm shooting a lot at 800mm. For practical purposes, IQ is the same and that third of a stop doesn't bother me one bit. However, the 800 is smaller and lighter - and I love that! I use the thing hand-held far more often that I anticipated. I think it comes down to how critical lower lights performance is for you in the 400-560/600mm range. You might not even really need a big prime. And, if you do, I would almost lean a little towards the 400 2.8. I figure, if most of your stuff is at 800mm, that 800PF would be your primary lens, not either of the exotics. In that case, the 400 2.8 might make more sense. You'd have 400 and 560 for the times you need it and then use the 800PF for most of your work.
I mean, a good argument can be made for the 600 as well, but if you're really at 800mm most of the time, why not use the lighter, smaller lens?
Obviously, if you were more 600/800/840 the 600 + 400 4.5 is the way to go, but at 800 all the time changes the game.
Just some thoughts.