Morning naps are starting to become a lot more predictable over the last few days - he usually has a good 2-2.5 hr sleep. He is really only in "happy wake time" for between 1 hr 10 and 1 hr 20, then takes between 5-10 minutes to settle, and usually without fail he has rewoken 20 min later. From there is mostly turns to custard for the rest of the afternoon.
In answer to your questions:
Yes, I am still swaddling, and mostly he stays wrapped, occassionally one hand fights its way up to his mouth - I guess is it a way of self-soothing?What do you mean by white noise? I have a stereo going in the nursery, with either instrumental music or the radio.
Yes, the room is dark.
Patting/shhhing to get him back to sleep generally only gives a very short term solution. Sometimes, he wails off and on whilst I am patting/shhing, and it usually escalates into a full on crying match, or this happens just after I have left the room. I haven't managed yet to get this method to work, but maybe I am not spending long enough?? How long should I spend doing this?
We have tried a pacifier, and depending on how upset he is, he mostly spits it out. If he does manage to hold onto it for 10 minutes, and then loses it, the crying starts up again.