Do you think Shelton Benjamin should be given a better move-set?

I think that "The Gold Standard" is a pretty good athlete and is one of the most underrated wrestlers in the WWE. I think that Vince should give him a move-set similar to Kurt Angle's or Chris Benoit's."Paydirt" just doesn't suit him. Do you think that Shelton would be a better performer if he changed his moves a little and began using moves like The ankle lock and the crippler crossface?