Morwen, I'm of German background, though not born in Germany nor a citizen, but I live here permanently. It's complicated...
Yes, you basically have the two main usages of "thee" and "thou", perhaps with the addition of the religious usage, which we find in passages of Tolkien's work as well.
Elmo, that's a great find! I haven't read the Athrabeth in quite a while, so I didn't remember that.
__________________
'Mercy!' cried Gandalf. 'If the giving of information is to be the cure of your inquisitiveness, I shall spend all the rest of my days in answering you. What more do you want to know?' 'The whole history of Middle-earth..
.'