As far as books go, for Kanji there’s a relatively new one for etymology called “World of Kanji”. The reprint was released this February I think.
You can check out what it looks like on the official website.
World of Kanji
At least to me it looks more interesting than The Complete Guide to Japanese Kanji although they achieve the same purpose.