Hi!
As stated, I'm interested to dive into two different periods of Japan's history:
The Edo period section is still empty in the book recommendations page, and for the modern period I saw no recommendations post-WW2.
Thank you!
Disclaimer: this is a personal recommendation based on how I judge the right match given the context you outlined in your question.
There are three almost fundamental books on this topic written by western authors aimed at exactly your kind of audience if you are looking for an overview on the periods you are interested in. They could be considered dated in terms of the source material they were brought up on, but I find it hard to think of authors that have replaced them in this niche, as more recent publications can be too focused on one topic or another to be very interesting to casual readers just getting started.
George Samson: A History of Japan, 1615-1867 (For Edo)
Edward Siedensticker: Tokyo Rising: The City Since the Great Earthquake (society focused).
Chalmers Johnson: MITI and the Japanese miracle : the growth of industrial policy, 1925-1975 -