I wouldn't wake her from her nap but allow a full 2 hours. I'm wondering if teeth aren't to blame. It may be those awful eye teeth that hurt like hell! I think my son got them somewhere in this age range. You might try some meds and see if that helps at all. (I feel like I've been a drug pusher the last few posts I've answered, but honestly teeth are a huge issue for early toddlers!
).
I'm also wondering if bedtime isn't about 30 minutes too late.
But my best guess is the teeth are starting to bother her, which is what is making it hard to go down for nap. In fact, it may be that she needs ehr nap to be a little EARLIER because teething is causing her to be OT! That would also explain the difficulties at bedtime and the NWs/EWs. with teething often comes some SA, which might explain why she wants the longer cuddles.
Try 1) Medicating naps and bedtime for a day or two, 2) moving nap earlier by 15 minutes, 3) moving bedtime earlier by 30 minutes. I know that sounds crazy since you feel like she's undertired, but I really doubt that she's undertired so soon after moving to 1 nap. It will probably take closer to 9-12 months before she's ready to stretch her A time more. As for shortening the nap, that will probably take closer to 1-2 years! Most toddlers stick to a 2 hour nap well into the 2s, and some well into the 3s.