LOL! Yes, you've got it! I hardly need bother posting the answers now, in fact I might just copy and paste yours as they are more detailed than mine!

If ever there is a discrepancy between LOTR and any other of Tolkien's writings, I always go for LOTR as well [except for the year that Aragorn found Gollum and then I go with UT LOL!]

I'm so glad you enjoyed doing it and thank you for researching it so thoroughly.