Haven't been on here for a while so nice to see some familiar faces - hello again

Well we're at the early stages of nap capping/extending morning A time but things are going a bit wonky now so I hoped those of you who've been through this stage might have some tips?
About 8 months ago M was doing:
7am WU
1-3pm nap
7:30pm BT
Then when he started to struggle to sleep at BT we pushed it back gradually until 8pm. Eventually he was getting to sleep later and later and we found that with less than 11h night sleep he really struggled the next morning, but was refreshed after his 2h nap. So we started nap capping gradually, which seemed to work well until a couple of months ago, when he was doing:
7am WU
1-2:15 nap
7:45pm BT
Then we started having the usual winter illnesses, molars and poo refusal leading to lots of discomfort etc etc, so did the following for a while:
7am WU (sometimes letting him sleep until 7:15 at weekends)
1-2:30 nap
7-7:30 BT, depending on how he'd slept the night before, how tired he was, etc.
This was our emergency measure to get through his various issues, however now that he seems to be done with that for the moment, he seems to have got so used to the longer nights that he's not resisting BT any more, he's resisting his nap. So after a few naps where PD has been at 1pm but he didn't get to sleep until 2pm (I've not let him sleep any later than 3pm), I decided I had to do something different, so started waking him at 6:45am, to keep the nap at the same time in relation to other fixed points in the day, but extend his morning A time and slightly shorten the night (but still > 11h). This did seem to be helping him to get to sleep for his nap more quickly, but for example today he again didn't get to sleep until 1:30pm, so I'm not sure if I should be extending his morning A time further or wait longer to see if he stabilises? Any ideas? He's not yet had an unbroken nap with the new 6.25h A time, he's always stirred at 45mins, but I'm not sure if it's OT or UT??? We've had some EW the last couple of mornings but yesterday was DH waking him as he tried to creep out early, and today he woke at 5am asking for water but then self-settled fairly quickly.
Sorry to ramble, what were your LOs morning A times like before you got to this stage of actually needing some no nap days, and what about nap lengths? I've somehow got it in my head that he'll need to be able to manage 7h well with probably 1h or less of a nap, before he's really ready to start dropping it?
Thanks all of you - sorry I can't say anything useful to those of you who are so much further along, only that I'm sure you can all look forward to the day when they no longer need to nap at all and we don't have to worry about being home at a certain time, etc!