I'd say the same since going back tells him that if he fights it he will get diapers back. My daughter is at a month and still having accidents. Progress is slow. Hang in there!
It's can take a while before they self initiate. Sounds like it's going well and I'd keep at it. Try to be patient!
Keep powering through if you're having success with prompting. He'll get there. X