I would drop it, personally. At some point all the changing between routines messes with the body clock and makes it hard to get into a routine.
My DS was done with all naps by age 2.5 and needed about 11hrs in total at that point (I ended up working it out on a graph!). If you can set a bedtime and let her self-regulate from there, her body will be more consistent. She certainly sounds old enough to be able to drop a nap.