No worries, there's a lot to sort out!! My guy was awake at 4:08!!! Took me an hour but I did get him back down until 6:45, though, so maybe we'll be back to a more normal routine - I hope!!
That first short nap is a tough one, for sure. Let's try winding her down even if she's not showing tired signs so that you're laying her in the crib at 2h or 2h5m and see how she does with that for a few days. Worth a try, again!
APOP means accidental parenting on purpose. It basically refers to when we rock, nurse, or otherwise assist LOs to sleep knowing it's not a good habit to be in but sometimes it has to be done to get them some rest!
The CN is usually dropped around 6mo although it is a long process for many (my house included!). I'd imagine if she's already fighting it that you may drop it early, but she may be fighting it because she's OT from that short first nap, not because she doesn't need it. So some routine tweaking might help that issue. But either way if you have to APOP the CN it's not going to be around for all that much longer so it's ok.
I think on days she doesn't CN you really do have to do an early bedtime otherwise that last A is going to be too long and she'll be OT, as you said. I would personally do the bottle last. For my LO nursing is really calming and so he loves to do that last right before bed. Not sure if the bottle is the same for your LO but either way milk is still the most important thing at this age so I'd make sure she gets a good milk feed as close to bed as possible. If nothing else it'll help you know she's not actually hungry if she wakes early for the DF.
She's still young so I would bet she still needs the DF. Tracy didn't recommend dropping it for bottle fed babies until closer to 7 mo. I would keep it up. It's possible that it's a habitual feed but it's hard to know and at this age you have to err on the side of feeding, in my opinion. Have you hit the 4mo GS (growth spurt) yet? She'll definitely want it again then, anyhow, so another reason I'd say not to drop it.
How does all that sound?