No, he absolutely deserves that for this. No, we shouldn't forget everything else in the past, but the fact is that McCain killed this vote. Without him, this would have passed.
The next big issue is going to be the national budget and tax reform, and McCain's importance is going to bed diminished. And hell, dude could be dead by then, or at least incapacitated. This will, most likely, be his last major vote for legislation unless they try all of this again and fly him out from his deathbed again and he votes yes. We'll see when we get there.