I used to think that tears at bedtime or naps was OT, but it can mean UT. In fact, that's more often the case with my 14 month old. If your LO is taking 45 minutes to fall asleep after a 40 min nap, it may be that she is undertired and is not ready for bed and is therefore just crying out. To be honest, you could probably start stretching her A times out and shortening that first am nap, if that's what you've decided is best for your/her routine. Some LOs like that morning nap and with my eldest son, I ended up leaving the morning nap as is and pushing it forward, with a short catnap in the pm. Eventually we just dropped that short nap and moved the nap toward mid-day.
Maybe something like this would work for you and your DD:
wake 7:15
nap 11-11:30
nap 2:30-4:00
bedtime 8
If she did that well the other day with the 30 min am nap/ long pm nap, then that looks like the way to go. If that last A time needs to be lengthened out more, then you may be closer to one nap than you think! Hope that helps!