I don't turn the lights on, only a nightlight, no diaper changes (unless there's a big poopie, which is very rare), and I don't even burp him anymore. The other night when I *had* to do a 2am diaper change, he woke up completely, but I put him in his crib (wide awake) and he surprised me by going straight back to sleep! I think he knows that between 6pm and 6am it is time to be asleep

Can you try comfort nursing? Or nursing laying down so he doesn't wake?