My approach with choir vs no choir was track-by-track preference. Some do sound better with the choir, but I was so used to hearing others choir-less that I left them as they were.
But with a score that has as so many edits, so much tracking and different versions of everything, I think you have to pick a simple approach and stick with it. Unless of course you *love* as opposed to *like* this score, in which case I'm sure there are some massively complex personal sets around.
Same idea as with Avatar really. My set for that runs around 2 hours, and has no logic at all in film vs alternate versions. I just used what sounded best for listening given the frankly astounding volume of material.
That's awesome! And also what it always boils down to: personal taste, make what works for you