Update: My complaining the other day must have done something! Last night I only went down to him once... he had milk when I would normally have just lay him back down, but he wanted it so I gave it to him. Then I woke up in my bed at 6am WOOHOO so he only had one wake up AND slept the night in his bed YAY. Hope that happens again tonight (minus the milk part)