On the geometric and topological rigidity of hyperbolic 3-manifolds