Risk Measures with Comonotonic Subadditivity or Convexity and Respecting Stochastic Orders