After 5 or so years of continuously getting the short end of the stick, Chavo needs to just come to terms that WWE is never going to push him in any kind of meaningful way, even minorly, so he might as well move on.
I'd put him as a valid contender for the IC title. I wouldn't book him higher...