A joint shear model incorporating small-scale and large-scale irregularities