Hi and welcome to the forums
It sounds like you've done so much already, well done you!
How much have you increased the first morning A time by if you don't mind me asking? what A time was she doing before? Your new routine looks quite good hun, I'd be interested to see what you were doing 4 days ago though if you could post a rough outline?
Tbh, I do think that first A is still too short, but as you've increased it recently (I'd like to see by how much first), I don't want to jump in and ask you to increase again quite yet. Maybe in a day or two.
You can see from your new routine you only have a 3hrs A time in the morning, whereas you've got 4hrs last thing after a 45mins nap. It may well be that last A is too long after a short nap. I'm thinking with increasing the first A and decreasing the last one we might get somewhere. You're definitely on the right track with your new changes, I just think a little tweaking might make it all the better
Wrt the NW. That sounds like definite teething to me. DD does that too, every 2hrs or so. Have you tried medicating at all? Ibuprofen usually works best for teething. Wrt BF, it looks like you're offering enough times during the day and always before solids, so that looks good hun. I'm thinking she might be using you more for comfort whilst teething rather than actually hungry. I think it's normal to maybe have one NF at this age, but any more you could end up with the opposite of what you're trying to achieve in that then she'll take all her BM during the night than day time xx