Your both doing a great job trying to help your bubs.
At 2 my ds2 is still up till awful hours of the night. Waking every 3 hours. But being asd it's par for the course. @heartstringz I think with ds1 my thoughts were get him down before the tired signs. Let him find his sweet spot and just sit in a chair and read while he is settling himself. That way I never missed it and he was happy I was there. @Clyon have you got a sleeping bag? Ds1 used one about that stage and it helped stop him from getting to the point of being awake when he was practising during the night.