Have you tried settling without feeding?
I personally think that NF is still very normal for babies her age, especially if BF. I know that she didn't use to do it till now and STTN, but I don't think there is something "wrong" with her waking at night.
However, she is still young for a 4h EASY and might will be better on 3.5h. It could be that 4h is too much for her and she is waking up hungry at night because she didn't get enough during the day.
I personally wouldn't change the CN, she might get OT at BT, and I think she might be ok on a little less A time than what she is having now. How long after she falls asleep she wakes up and needs settling during a nap? If it's 30-35min then she is probably OT.