It sounds like it could happen, and I was wondering the same thing. I personally am all for it, he should wrestle for his last few years where he can still wrestle a good match, after that return to color commentating.
Or you could have Tazz just wrestle every now and again. Kinda like Lawler back in 2003. But I'd rather go with the first option