Struggling with daytime naps and waking up early are both the same issue.
You struggle with these more than bedtime because sleep pressure is low. This is the amount of force the body clock puts on us to sleep. Even though we might need to go to sleep, the pressure to go to sleep is greatest at bedtime and is less during the daytime and early morning.
Both will ultimately be solved by looking at the method you use to get baby to go to sleep. The key, important thing is that baby goes to sleep where they stay asleep. So going from fully awake to fully asleep in the cot rather than (say) going to sleep mostly in your arms and then being put down in the cot.
The reason this is important is to do with the fact that we (adults and babies) sleep in cycles of light and deep sleep with very brief periods of wakfullness between cycles. Imagine you want to sleep in your bed and between sleep cycles you rolled over and glanced at the clock ready to settle back to sleep... then suddenly realised you are in the backseat of a car. You wouldn't just roll over and go back to sleep. Your mind would be going WTF happened? Where am I? Why am I here? And in your confusion you would wake fully up.
This brief waking between sleep cycles happens in babies too. It is greater when sleep pressure, in particular early morning. So if baby didn't have good sleep habits in going to sleep, you see the effects greatest in early morning and daytime naps when sleep pressure is low.
So firstly, look at the way you get baby to sleep.
Secondly, and maybe in the interim while changing your methods in going to sleep, make going sleep as easy as possible for baby when sleep pressure is low.
So, for example, try to get to baby and resettle as quickly as humanly possible. The easiest time to resettle is just as baby goes into very light sleep but before actually waking up. You might just see a shift in position or facial expression when this happens. When crying starts it's getting too late.
If you miss the chance to resettle, try feeding as soon as you can and redoing what you'd do at bedtime. The feeding isn't about needing nourishment, it's about comfort and soothing baby back to sleep as quickly as possible.
In terms of timing - it's reasonable to expect 10-12h of night time sleep at this age. So working to an average of 11h, your 7pm bedtime should be a wake up at 6am (or in the 5am-7am range). I'd personally push this towards 8pm so that morning wake up is 7am (give or take an hour), but it's more about personal preference.
It's fair to say 7pm to 4am is not likely to be her natural sleep time overnight, it wouldn't be a healthy amount of sleep. So solving this isn't about saying I'll slide bedtime later do she still has 9h sleep but at a different time. It's moreso about solving the reason for early waking so she has more sleep overnight.