Scalar curvature rigidity and versions of Min-Oo's conjecture