Please don’t put him in diapers. Pull- ups are bad enough for his confidence.
Have you tried waking him in middle of the night to go the bathroom? It’s very hard to time it just right, but worth a shot.
The good news is that he’ll outgrow it IY”H, the bad news is that it may still take a couple of years. Hatzlacha!