The Making of Modern Japan, by Jansen, is just after the time period, but it so amazingly fantastic that it's a must read for anyone interested in Japanese history. The Meiji Period is what is best covered, but the details of life in the Daimyo and the social history of Edo period is just breathtaking. Highly recommended.