Season 2 is having more deviations from the books, but I think that was inevitable since a story with as many characters really can't be compressed into TV very easily.
Though I've always liked Catelyn, even before the show.
--
No amount of planning will ever replace dumb luck.