No. You have clearly really tried hard to answer this clue. And I am also in a good mood, because I woke early as well as retiring very late, with a drive to complete yet another password I'd been thinking of for a while ... and complete it I just have! So two more added to my stock in less than seven hours, about four of which were spent asleep.
There's nothing to really catch you out in the two remaining clues. They are the same kinds of answers as the ones already there.
One of them you would first think of by another name, but I wanted to keep to first letters for the password if at all possible. However, the name I *have* used is not obscure, by any stretch of the imagination. In fact, I believe it is used exactly as many times as the one people would tend to think of first!
For the 'Scottish' clue, what I would do is try another 'thing' like the 'things' that are already answers in this puzzle, then consider the 'Scottish' connection, keeping the words 'sounds like' in mind.
The other one could equally have had BERYL as the answer, but I wanted Glorfindel to have his moment and I needed an answer in this position that didn't begin with B, but with another letter.