Rick is Shane. And it's about time.
Shane was out for himself and made any excuses necessary to get what he wanted, in in terms of extremes Rick is in no way equivalent to Shane now, and Rick still has morality where as Shane did not. RIck is pragmatic and teetering on the edge of madness, not teetering on the edge of becoming Shane. He's only 'Shane 2.0' if you consider him to be willing to go to (lesser) extremes, but in the name of protecting others, being better than Shane in every way, and having a moral selfless compass, which Shane did not.