I found this age to be very tough as well. Myles was having early wakings (sometimes as early as 4:30am :shock: ), would often protest nap and/or bedtime, etc.. I don;'t know if it had to do with molars and eyeteeth, or so many new developmental milestones, or what. But I just tried to stay consistent as possible, and ensured that he was falling asleep independently and that we didn't create any new bad habits. So trust me, I can sympathize! We would have good days and some not so good days, but every day was a new day. I really just learned to relax about it (I know easier said than done!), and just kind of go with the flow.
Maybe try and increase her awake time before her nap? Myles was usually good for 6-6.5 hours after waking in the am before he needed his nap. Are you still going in to settle her at naptime? If you are this may be a bit of a culprit.