Resources for etymology?

So one thing I've realized is that I am really good at remembering vocab, groups of words and even grammar when I've got an understanding of the etymology behind it and how words developed into what they are. And also I just find it interesting. I was wondering if anyone has come across any resources for this?

The perfect thing would be essentially a japanese language focused version of https://www.etymonline.com/ but I'm open to anything really. My main concern though is that it's actually accurate, as from what I've seen (especially in english versions of this sort of thing) a lot of them use folk etymologies or just create their own etymythologies that have nothing to do with the actual history of the word.

I'm not so much looking for overviews of how the writing system or phonetics developed overall (but would still be interested in that) but more so something that provides a full index in a dictionary or encyclopedia format. Something like an EPWING/yomitan dictionary would be great.

I've found https://gogen-yurai.jp/ which is good, but somewhat sparse and a bit more focused on sayings from what I can tell. I'm also not sure how rigorous or reliable it is.

by nonowords