To be honest hun, looking at her adjusted age she is still only really young so the fact that she is only having one NW is not unusual at all. It sounds like things may get better on there own as she matures too.
So if she takes the DF and then you feed her if she wakes after say 3am does she take a feed then and resettle? It seems that she is just starting to learn to be able to sort herself out without your help now when she NW. Maybe you could try shush/pat for less time or do it lighter until you are hardly touching her at all.