I personally don't think that the movies would have worked if they were shot directly from the book, and I think Peter Jackson's team done a good job of adapting the books into watchable movies with mass appeal. However, if a book cut is what you want, it sounds like you have made some good choices and done a good job. I also agree that the 'warmed up' Lothlorien is far superior to the original, and from your screenshots is a lot closer to what I imagined when reading the book, so well done.