HI - any help much appreciated

My EBF 14 week baby girl is having a few issues. She was 13lb14 when I last got her weighed 3 weeks ago, so she's a big girl for her age!
Firstly she keeps waking up after 30 minutes for her daytime naps. I know this is normal, but she won't re-settle herself in her cot. I can't even help her get back to sleep (tried rocking, feeding, sitting with her, leaving her for 5 mins). But she is fine out and about in the buggy, so that's what I am doing. It means she gets the sleep she needs but I am quite tired of pounding the pavements and I would love her to be able to sleep for a longer stint in her cot during the day. I know it's really important and she gets so cranky if she doesn't have one longer nap.
We are also having some strange nighttime patterns at the moment. I dreamfeed her at 1030pm. She used to be able to go until between 3-4am (even 5am once!) with the help of dummy/ re-settling. But now she is wide awake and wanting a feed at 2am every night. Then she is hard to get back to sleep.
I thought things were heading in the right direction, but they seem to be going backwards. I am not really for the 'cry it out' or give her water methods. If she's genuinely hungry I'd rather feed her. I'd just like to know if I can change anything I am doing in the day perhaps to make her go for longer. When she was waking at 4am, I saw the light at the end of the tunnel. But a 2am feed seems like it's going to be very hard to ditch in the near future.
I am wondering if leaving her instead of doing the dreamfeed might allow her to have a longer stretch, but I am also worried she won't go back to sleep for long after.
At the moment she is going to sleep at 1830.
I feed her: 0700, 1030, 1430, 1700, 1815, 1030 (dreamfeed) and preferably once in the night.
Thanks guys.