My DD was doing the same thing at the same age, and we invested in a baby swing. I always said I wouldn't, but my sanity needed it! I limited it's use, and sometimes it was great not necessarily to get her to sleep, but just to calm her down and become sleepy, then I would rock her off and pop her in her bassinett. She did have the odd sleep in it too, but they were only ever short cat naps. I think within 2 weeks the wonder week had passed and the swing wasn't used nearly as much. It worked for us that's for sure!

Hope she settles soon