The KLA tapes and attending reflections sound good, Slowly...I'm right behind you, peering in. Yes, do the cavity thing--lots of us avoid this, but it will be one monkey off your back if you do.
You are very much on the right path (though it seems like NG might have some stuff in there to work on....but you of course can't *control* this ).