How about a cotton sleeper? You could cut off th legs at the knee and cut off the sleeves if you think he'll get too hot. You could even put it on backwards if he can defeat the zipper.

I have tried sleepers and he still figures out how to get his hands in his diaper

They have one piece outfits for children his age. They might not be the cutest things but it will curb the behavior