Sure I read somewhere that the stuff with Sin Cara, matchwise, will just be a houseshow thing to continue helping him fit the WWE mould.
As much as I love Chavo, he's damaged goods thanks to the last couple of years.... What I'd really like to see is him taking on his own protege to take down Sin Cara (Just imagine if he had a next gen Guerrero to manage!).