J.K.
I own a cloth diaper shop and am at the end of potty learning with my son. I highly recommend Knickernappies pocket diapers. They have elastic at the front and back, so they can be pulled up and down just like disposable pull-ups. Since they're a pocket diaper, everything is held in place nicely and you can stuff with whatever you'd like! I recommend a hemp inset along with the Loopy-Do insert that comes with the diaper. This will be no thicker than the prefolds you've been using, but will be infinitely more absorbent! These also unsnap at the sides to make stuffing easier and clean up of messes easier. Given your son's size and age, I'd recommend size medium. You can find Knickernappies on my website: http://www.simplecloth.com Also, feel free to write me at ____@____.com!