Aishi - I wonder if you need to accept that an 11hr night is pretty good at this age and work a routine around that. The 20min CN is the way to go for you, since LO will still settle for it. When you get to JM's predicament of LO refusing the PM nap outright, you kinda have to go with short AM/long PM.
A nap of 1hr25 isn't *that* short of 1.5hr, so if it stays there consistently, it should be fine. Being me, I'd increase the A time a bit and see if I could get a longer nap but its not going to end up with LO being chronically OT. 1hr20 is usually a good trigger to increase A time.
Wu 7.45
Nap1 11.35-1.00 slightly UT?
Nap2 4.25-5.10
BT 8
Probably better off capping the nap at 4:45 or 4:55 rather than 5:10 - that extra little bit can buy a LO as much as another hour of A time at this age.