On the non-linear Maxwell-Cattaneo equation with non-constant diffusivity: Shock and discontinuity waves