Sorry to continue to bother you all, I just need to clear my head by writing things down here too.
Oh Honey, please don't think my last post meant in any way we are not here for you, I can just sense how stressed you are, and I know it is hard, so you could do with taking a deep breathe and realising you simply can't always 'fix' things overnight. I agree with everything the ladies have said in PP. I think what you need is a solid plan. A set nap time and nap length no matter what time he wakes. Then as suggested you can nudge BT forward on nap refusal days, if he is struggling. So I'd shoot for this maybe:
WU (whatever it is 6/6.30)
Nap 1.00 til 2 capped
BT 7.30 (asleep for)
Personally, I'd put down for his nap at the same time, but I'd also wake at the same time, if he takes a while to settle, so wake at 2 no matter what, or you won't have the consistency. I know it's hard nap capping and pushing through the OT, but it is the only way to get better nights. I have known many LO's end up on a 20 min capped nap! to get through the 1-0. Definitely put the gro-clock on no matter what, or that will just get messier, he'll get the message if you're consistent. I know any wavering from the 'gro clock' rules bites you in the ass! lol.
Also it's really important to remember that trying something for one day will very very rarely show results, you need to stick to a plan for quite some time, before you can conclude it's not working. I always find that a solid plan takes away the stress from me, all the changing up just drives me crazy. So you go with it and if it backfires, you crack on until BT. Do consider what you are doing on no nap afternoons though Hun, keeping it low key if possible.
Have you considered shooting for a 20 min cat nap in the car around 4 pm on no nap days

instead of EBT, because he hasn't tacked on in the past. This was an absolute life saver for us during the 1-0 on total melt down days, and although LO can be hard to wake, it's not long to get through to BT, so in some ways easier than waking from an earlier nap.
(HUGS) Sweetie.x.