I would make bedtime earlier or add a little more A time before the nap if you think LO can handle it. Ella has never been able to handle a long A time before bed. For us it's better to aire on the side of caution and put to bed earlier rather than later so she can winddown and fall asleep when she needs to. At 20 months and still now Ella's routine is:
wake between 7 am and 8 am, get-up @ 8
12:45/1 - 3/3:30: nap (i wake her @ 3:30 if necessary)
7:30: bed
4 - 4.5 hours of A time before bed works for her because she does best when she is asleep by 5 hours at most. Nap and bedtimes are when she goes into her crib, generally I don't know exactly when she falls asleep because she is usually silent right away. The only time I know is when she is having a kick fest on the crib rails and it finally stops.
Some nights it takes her close to an hour to fall asleep for the night, but luckily she is content to relax alone and drift off when she needs to. Last night after a 2.5 hour nap she took until almost 8:30 to fall asleep, but she and I like the long naps so we keep them.