I honestly found that the less I woke DD, the better things got. She often surprised me by taking a good nap after a really good night. If you stop waking him and he does stop napping and keep on with 12hr nights then you know he's really ready to drop the nap.