If she's having lots of EW and NW's then I think she's on a bit of an UT/OT loop, in which case I'd suggest two things. #1 Give her another small A push, and #2 APOP to get a couple of good naps. Put her a baby carrier, stroller, go for a long drive, W2S whatever you need to do to get at least one good nap out of her, and that will likely put her on better footing for improved naps.