Had you tried yaolan, the cradle? My son is like that too and is fussy before falling asleep. We bought the automatic cradle that rocks him to sleep and he likes, fuss a little, pop in a pacifier when he fusses longer and he sleeps very well at night.