At this age, E time especially if you are breastfeeding can be a bit flexible. You will be introducing solids soon, so everthing will change:).
Yes, usually when you have a routine with a short nap like 30-45min, it's worth to have a shorter A afterwards. I wouldn't recommend it but her nap seems to be an OT one if she is waking in between. It's possible she is UT also, but after 3.5h A at that ahe I would suspect rather OT.