Fisher price bouncy chair with vibrate setting (that doesn't shut off until you shut it off) is what worked wonders for my dd who sounds very similar to yours. At 11 months she still naps in it! Though those days are running out as she's outgrowing it.