Yael,

Just one thing off the top of my head that could possibly help......with breaking the 40 minute sleep cycle thing.........(you may be doing this already, so please feel free to ignore!)

Do you have any music playing for him? ie Peacebaby or similar? A CD that lasts more than 40 mins? Do you have a little CD player with a repeat function?

Peacebaby, for example, has the sleep assisting 60 beats per minute which is suggested really helps restful deep sleep, and the CD lasts for around 47 mins.....it may help break the 40 minute cycle, especially if you have it on repeat?

(It also has the benefit of keeping YOU calm, which always helps!)