Blow-up of nonlinear wave equations with small initial data-a geometric perspective on shock formation II