Great to hear you had a good weekend
Looking at your day when away nap was 1pm on a later WU with a longer A to bed in the afternoon....do you think your missing the window putting him down at 1.30pm with a 6.30am WU!? As then you have a much shorter A to bed..I'd prob go with setting nap at 1pm telling him it's time to rest in bed and if he doesn't sleep then he's had quiet time, and then shoot for EBT.
FWIW we went to Florida Disney when DS was just under 3yrs old and he had dropped nap pretty much but he had 1.5 hour nap most days and did 12 hours night...!best sleep we'd had in a year!! All I can put it down to is lots of extra activity. When we got home back to no nap and 11 hour nights
Will he sleep in stroller if you went for a well timed walk?x