Development of a Two-Equation Turbulence Model for Mean Shear- and Internal Wave-Driven Mixing