It's always about sleep!

My DD is 8.5 months old now and we transitioned her to 2 naps about 3 weeks ago and it was pretty painless because she seemed more than ready. Since that transition our schedule looks something like this:

7:30am wake up
10am-11/11:30am 1st nap (2.5 hrs awake time)
2:30pm/3pm 2nd nap (3.5 hrs awake time)
4pm up from second nap no matter what
7:30pm start bedtime routine
8pm asleep

Up until a couple of nights ago she was waking once per night to eat but we have managed to drop that feed by making sure she is getting enough calories during the day.

We are now running into 2 issues:
1. She is waking between 5am and 6am each morning and will not go back to sleep unless I go in and rock her. She puts herself to sleep for naps and bedtime no problem

2. During both naps she is waking up every 30 minutes and won't go back to sleep unless I go in and rub her back

I know I need to stop the rocking for the early morning wake up and the back rubbing at naps because they are a whole separate issue but I am wondering if anyone can suggest changes that we could make to her schedule to get her back to decent naps and get her to sleep all the way through in the evening. I think we need to shorten up the wake time between the 1st and 2nd nap but my SO is not convinced. Any suggestions welcome!