Agree with your critique of Wolff. I’m on a similar quest and have some resources you might find interesting. Feel free to reach out on gmail–same handle.