For us, longer naps compounded the early wakes. But DS did not cope with capping so we just had to carry on.
1.5 sounds reasonable! If you can get her body into a routine then she should get used to having the catch up sleep during the night. We were on a 6am wake and 2pm nap for the longest time. Think bedtime was around 7.30, asleep for 8.