But she's in a OT/UT loop. The only way is to continue to push when she's had good naps. But remember, gradually!

...not all at once.
A times are just a guideline. Not all babies will do exactly 3hr A time everytime. Yk? On short naps, I pull back a few minutes since he will be more tired from a short nap come the next A time, kwim? ...some babies can do 3.15/3.30 at this age, some less? It's just give or take on what you feel your baby needs. Sometimes it can be very confusing reading their signs. They seem OT but aren't. A number of things can bother them such as teething, over stimulation, or not enough... Discomfort due to introducing solids around this time. So just hang in there. I would def not be doing 2hr A times like you have, at this age. Your getting 6am happy wakes because she's UT from all her day sleep and short A times. That's the loop... So you have to push through. She will be OT slightly but it's how you get out of it. After a few days they adjust, I promise

but always better pushing gradually by a few mins at a time than to just go all for it.
The CN at this stage is best given only when BT is too far out. Depending on naps that day or if the day started too early. If you feel she is incredibly OT, mom knows best

, then I would opt for early bedtime rather than a CN. Night sleep is more restorative. EBT is best used during this time of transition and to catch babies up on OT, which happens when they are ready to drop a nap. For example if her last nap ends by 2:00 then you would want to CN around 4:30-5pm. Again, I do not know how much your LO can handle A time at the end of the day. All babies are different

...some can handle a longer A time to bed, and some need a shorter one. An idea that floats around is that baby does best on a 12 hr day... So if she wakes at 7am she should be in bed asleep by 7pm... In the perfect world

...but something to consider. Also, if she's waking at 6am happy and went to bed at 7pm the night before, technically thats 11hrs of sleep and wouldnt really be considered an EW.
What A time can she handle on a short nap? Usually if mine does an OT 30 min nap, instead of 3hr A time (asleep BY 3hrs. Not put down at the 3hr A time) I usually push back the next A time by 10 mins or so... Asleep BY 2.50hrs. Something like that.
Every baby is different so someone always has something to say

...keep in mind there is a growth spurt around this time! So if baby wakes at night, I would always feed. That's me. If he wakes, I'm feeding him. If after awhile I notice he's waking and BARELY eating, then I know it's not hunger and I would soothe in other ways. You said you don't mind the paci correct? Paci is a prop and until she learns how to replug, she might continue needing your help when she wakes nights. I think they are a great tool but if u wish to sleep train, that would mean removing the paci and have her find her own way to sleep. Also, babies wake around this time for a number of reasons-- teething starts around this time too. Expect NWs to happen from time to time. 1-2 can be very normal for many moms! Hang in there
Many Hugs! Let me know how it goes

hope I was helpful!