Yeah he defiantly got Rick back to where he needs to be. I will say though looking back at the story as a whole, it makes sense to me for Rick to go through his crazy farmer phase in order to get him to be the point he's at now.
The point he is at now is exactly the same point he was at the end of season 2.