Don't personally think Gibbs has peaked yet. Last season was the first when he didn't suffer too many injuries but wasn't completely fit either. He was a left sided winger playing for the youth sides so his lack of quality in the final third is very surprising. I think if he stays fit he has another gear in him. Some to come from more experience defensively and some unlocked potential in attack will come with confidence.
That said, Shaw certainly has a higher ceiling. I will be happy affording Gibbs another season but if like you say he has plateaued, then may be look for someone like Ricardo Rodriguez.