I always found that the long feed or cluster of feeds before bed was bub's way of stocking up for the night and cutting that short lead to more wakeups.
Are any of her night feeds not serious feeds (i.e. suck for a couple of minutes and fall asleep)? Those may be ones you can substitute with a drink of water and a cuddle.
She may sleep a bit better if you can give her a snack (avocado used to work well for DS) before booby and bed too.
I add this up and get a bub that has 8 hours sleep total overnight - I'm wondering whether she's a bit sleep deprived and hence grumpy and hence wants more booby. But there's no easy solution to that one either....