Ok, it turns out he did sleep yesterday. And today we put him down straight after swimming (about 9:45) as we were going out for lunch and he fell asleep straight away. And I had to wake him (and DS1 and DH!) to go to lunch (for MIL's birthday so we couldn't skip it).

So it looks like it's not over yet thank goodness!