My daughter is now 4 1/2 yrs old and we went through, and sometimes now still do. . .go through that phase.
I do not change anything. . .she did need her naps everyday and really for a 2 year old that is too young to give it up, especially if taking so long to go to sleep. Don't think about losing the nap until closer to 4 or 5 years old (for your own sanity and rest during the day too).
Anyway, I figured out that if I preempt her coming out we suceeded. She has several stuffed animals she sleeps with. I took them all out of bed and said if she stayed in bed for 5 minutes (bedtime was 7 or 7:30 at that age) then I would bring back one of her friends and check on her. She chose which one came back first. Then next I said you have to stay in bed 10 minutes and get the next friend (of course she has no concept of time at that age, but she would stay for the friend), then went to 15 minutes before I came back to check on her. Then once the three friends were back in bed, I told her I would come check on her again in 15 minutes. If she got out of bed, then I would restart the count down for the next friend to come back.
I had tried taking away friends when she got out of bed, but then she would get out and just hand me a friend. So, I decided that "rewarding" was better and so she got a friend and got to see me again. The check was very quick. Friend given, kiss and goodnight, with reassurance when next check was.
This only took a week or so, so after a few days of one by one with stuffed animals, then went to jackpot, where I checked on her in 1st 5 minutes and she got two at once and so on. After a couple days of several at once, then I extended the first check to 10 or 15 minutes and gave all animals at once. Then just went to checking on her on a mutually agreed upon time (she usually was used to saying 5 minutes, so that is what we did).
After conquering that. . .then I tackled the waking mommy up in the middle of the night. If you would like some information on how we did that I will share as well. Again, used positive reinforcement and only took a couple of days to master, which she still sleep through the night to this day, with an occasional wake up maybe once a month from scary dream or such.
Good luck. You can do it. It is a phase and I think they all go through it. Please don't lose the nap, you will really miss that down time when it is gone (as ours is now. ..) :)
E.