The solution to a Columbia situation was the aforementioned stay at the ISS. The idea was to have many solutions for a range of situations. No reason to throw away a billion dollar shuttle if there is a repair in space option