Sounds very familiar! My DD was the same and right at the same time too. I struggled through it for a couple of months and then caved and went to sleep school. They were fantastic and said "let's work on day sleeps first". It took a couple of nights and consistency but basically her day sleeps got better and, to my surprise, her night sleeps followed.

The other thing you could try is babywearing. You say she wakes again when the movement stops? Try wearing her in a decent, supportive, ergonomic carrier (some are very much NOT supportive or ergonomic) or a wrap while you do things around the house or go shopping or for a walk etc. Babywearing has magic sleepy dust