Just to jump in here. Its best to get it done right first, than needing to fix it later.
It also means it doesnt get missed when sources do come as thats always a very easy thing to miss.
I'm doing my best, but honestly I haven't gotten into it to do much more than broad strokes at the moment. If you'll notice, most of what I've done is little more than summarize the role of each thing in the book rather than a full breakdown. Hence the more broad referencing.
I'd still try and chapter source. :) Helps source exact information! A good way to imagine it is every chapter being a mini-story. That just so happens to be in one collection
Only exception I'd say is books (Anthologies do this) without chapters at all.
I added chapters where I could but some of it occurred in too broad a degree to bother.
When adding sources, we tend to add chapters! :) I was looking though your Divine Wind refs and it was missing that. :( So its harder to verify a lotta stuff.