hello!!
big hugs all round.
I know how you guys are feeling, I feel like I have battled through every type of sleep issue with my two - I have a 4 year old daughter and 4.5 month old son.
I too ended up clock watching for a while, but it just was not the best way forward for me. So I totally went with their cues and and routine is a little bit of EASA, but it works really well for us.
When my son starts fussing, I move him on to something else, I used to assume that first fuss was tiredness but it was sometimes boredom. So now when he starts I take him upstairs and lay him on our bed whilst I do my upstairs jobs, when he starts fussing again, I know this is tiredness, so pop him in his grobag and pop him down.
With the swaddling, I swaddled both of mine until they started fighting it, and then I just swaddled one arm. This was quite a nice half way house for them before total freedom and it also encouraged them both to self soothe a bit by sucking their fingers.
They both also went through a phase of 5.00am wake ups, but eventually both got through it as we kept treating it as a night waking.
Certainly with both of mine we went through a period of it all going horribly wrong before it got better again.
You both sound like you are doing just great! Its so hard isnt it, but am sure when our kids our millionaires we can remind them of these times......
Take care and keep in touch.
Lizzie xx