This should actually be his thing. He always smiles and makes light of everything. Have heels shyt on him and him turn the cheek over and over again much like the early version of New Day.Get ya ass beat and come out smiling like you hit the lottery brehs
Then have him finally find a backbone/mean streak maybe brought out by a tag partner or manager. I always saw him with Titus for some reason. It could work and give him some depth.
Let me stop making sense. This is WWE.